Cosmetic fixes

Author: ultrasecreth

common/src/main/scala/org/mockito/mockito.scala

@@ -11,35 +11,29 @@ package object mockito {
 
   //noinspection ConvertExpressionToSAM
   def invocationToAnswer[T](f: InvocationOnMock => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] = new Answer[Any] {
-    override def answer(invocation: InvocationOnMock): Any= $vce.extract(f(invocation))
+    override def answer(invocation: InvocationOnMock): Any = $vce.extract(f(invocation))
   }
 
-  def functionToAnswer[T, P0](f: P0 => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] = invocationToAnswer(i => f(i.getArgument[P0](0)))
+  def functionToAnswer[T: ValueClassExtractor, P0](f: P0 => T): Answer[Any] =
+    invocationToAnswer(i => f(i.getArgument[P0](0)))
 
-  def functionToAnswer[T, P1, P0](f: (P0, P1) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P1, P0](f: (P0, P1) => T): Answer[Any] =
     invocationToAnswer(i => f(i.getArgument[P0](0), i.getArgument[P1](1)))
 
-  def functionToAnswer[T, P2, P1, P0](f: (P0, P1, P2) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P2, P1, P0](f: (P0, P1, P2) => T): Answer[Any] =
     invocationToAnswer(i => f(i.getArgument[P0](0), i.getArgument[P1](1), i.getArgument[P2](2)))
 
-  def functionToAnswer[T, P3, P2, P1, P0](f: (P0, P1, P2, P3) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P3, P2, P1, P0](f: (P0, P1, P2, P3) => T): Answer[Any] =
     invocationToAnswer(i => f(i.getArgument[P0](0), i.getArgument[P1](1), i.getArgument[P2](2), i.getArgument[P3](3)))
 
-  def functionToAnswer[T, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
-    invocationToAnswer(i =>
-      f(i.getArgument[P0](0), i.getArgument[P1](1), i.getArgument[P2](2), i.getArgument[P3](3), i.getArgument[P4](4)))
+  def functionToAnswer[T: ValueClassExtractor, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4) => T): Answer[Any] =
+    invocationToAnswer(i => f(i.getArgument[P0](0), i.getArgument[P1](1), i.getArgument[P2](2), i.getArgument[P3](3), i.getArgument[P4](4)))
 
-  def functionToAnswer[T, P5, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4, P5) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
-    invocationToAnswer(
-      i =>
-        f(i.getArgument[P0](0),
-          i.getArgument[P1](1),
-          i.getArgument[P2](2),
-          i.getArgument[P3](3),
-          i.getArgument[P4](4),
-          i.getArgument[P5](5)))
+  def functionToAnswer[T: ValueClassExtractor, P5, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4, P5) => T): Answer[Any] =
+    invocationToAnswer(i =>
+      f(i.getArgument[P0](0), i.getArgument[P1](1), i.getArgument[P2](2), i.getArgument[P3](3), i.getArgument[P4](4), i.getArgument[P5](5)))
 
-  def functionToAnswer[T, P6, P5, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4, P5, P6) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P6, P5, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4, P5, P6) => T): Answer[Any] =
     invocationToAnswer(
       i =>
         f(i.getArgument[P0](0),
@@ -50,7 +44,7 @@ package object mockito {
           i.getArgument[P5](5),
           i.getArgument[P6](6)))
 
-  def functionToAnswer[T, P7, P6, P5, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4, P5, P6, P7) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P7, P6, P5, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4, P5, P6, P7) => T): Answer[Any] =
     invocationToAnswer(
       i =>
         f(
@@ -64,7 +58,8 @@ package object mockito {
           i.getArgument[P7](7)
       ))
 
-  def functionToAnswer[T, P8, P7, P6, P5, P4, P3, P2, P1, P0](f: (P0, P1, P2, P3, P4, P5, P6, P7, P8) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P8, P7, P6, P5, P4, P3, P2, P1, P0](
+      f: (P0, P1, P2, P3, P4, P5, P6, P7, P8) => T): Answer[Any] =
     invocationToAnswer(
       i =>
         f(
@@ -79,8 +74,8 @@ package object mockito {
           i.getArgument[P8](8)
       ))
 
-  def functionToAnswer[T, P9, P8, P7, P6, P5, P4, P3, P2, P1, P0](
-      f: (P0, P1, P2, P3, P4, P5, P6, P7, P8, P9) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P9, P8, P7, P6, P5, P4, P3, P2, P1, P0](
+      f: (P0, P1, P2, P3, P4, P5, P6, P7, P8, P9) => T): Answer[Any] =
     invocationToAnswer(
       i =>
         f(
@@ -96,8 +91,8 @@ package object mockito {
           i.getArgument[P9](9)
       ))
 
-  def functionToAnswer[T, P10, P9, P8, P7, P6, P5, P4, P3, P2, P1, P0](
-      f: (P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) => T)(implicit $vce: ValueClassExtractor[T]): Answer[Any] =
+  def functionToAnswer[T: ValueClassExtractor, P10, P9, P8, P7, P6, P5, P4, P3, P2, P1, P0](
+      f: (P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) => T): Answer[Any] =
     invocationToAnswer(
       i =>
         f(

macro/src/main/scala/org/mockito/WhenMacro.scala

@@ -10,8 +10,8 @@ import scala.reflect.ClassTag
 
 object WhenMacro {
 
-  class ReturnActions[T](os: ScalaFirstStubbing[T]) {
-    def apply(value: T)(implicit $vce: ValueClassExtractor[T]): ScalaOngoingStubbing[T] = os thenReturn value
+  class ReturnActions[T: ValueClassExtractor](os: ScalaFirstStubbing[T]) {
+    def apply(value: T): ScalaOngoingStubbing[T] = os thenReturn value
   }
 
   def shouldReturn[T: c.WeakTypeTag](c: blackbox.Context): c.Expr[ReturnActions[T]] = {