address code review

typelevel · Dec 12, 2017 · b5daed3 · b5daed3
1 parent fc59e26
commit b5daed3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/core/src/main/scala/cats/data/Kleisli.scala b/core/src/main/scala/cats/data/Kleisli.scala
@@ -229,13 +229,13 @@ private[data] sealed abstract class KleisliInstances6 extends KleisliInstances7
 }
 
 private[data] sealed abstract class KleisliInstances7 extends KleisliInstances8 {
-  implicit def catsDataFunctorForKleisli[F[_], A](implicit F0: Functor[F]): Functor[Kleisli[F, A, ?]] =
-    new KleisliFunctor[F, A] { def F: Functor[F] = F0 }
+  implicit def catsDataDistributiveForKleisli[F[_], R](implicit F0: Distributive[F]): Distributive[Kleisli[F, R, ?]] =
+    new KleisliDistributive[F, R] { implicit def F: Distributive[F] = F0 }
 }
 
 private[data] sealed abstract class KleisliInstances8 {
-  implicit def kleisliDistributive[F[_], R](implicit F0: Distributive[F]): Distributive[Kleisli[F, R, ?]] =
-    new KleisliDistributive[F, R] { implicit def F: Distributive[F] = F0 }
+  implicit def catsDataFunctorForKleisli[F[_], A](implicit F0: Functor[F]): Functor[Kleisli[F, A, ?]] =
+    new KleisliFunctor[F, A] { def F: Functor[F] = F0 }
 }
 
 private[data] trait KleisliCommutativeArrow[F[_]] extends CommutativeArrow[Kleisli[F, ?, ?]] with KleisliArrow[F] {

diff --git a/core/src/main/scala/cats/data/Nested.scala b/core/src/main/scala/cats/data/Nested.scala
@@ -139,6 +139,11 @@ private[data] sealed abstract class NestedInstances8 extends NestedInstances9 {
     new NestedApply[F, G] {
       val FG: Apply[λ[α => F[G[α]]]] = Apply[F].compose[G]
     }
+
+  implicit def catsDataDistributiveForNested[F[_]: Distributive, G[_]: Distributive]: Distributive[Nested[F, G, ?]] =
+    new NestedDistributive[F, G] {
+      val FG: Distributive[λ[α => F[G[α]]]] = Distributive[F].compose[G]
+    }
 }
 
 private[data] sealed abstract class NestedInstances9 extends NestedInstances10 {
@@ -167,11 +172,6 @@ private[data] sealed abstract class NestedInstances12 {
     new NestedInvariant[F, G] {
       val FG: Invariant[λ[α => F[G[α]]]] = Invariant[F].composeContravariant[G]
     }
-
-  implicit def catsDataDistributiveForNested[F[_]: Distributive, G[_]: Distributive]: Distributive[Nested[F, G, ?]] =
-    new NestedDistributive[F, G] {
-      val FG: Distributive[λ[α => F[G[α]]]] = Distributive[F].compose[G]
-    }
 }
 
 private[data] trait NestedInvariant[F[_], G[_]] extends Invariant[Nested[F, G, ?]] {

diff --git a/core/src/main/scala/cats/data/Tuple2K.scala b/core/src/main/scala/cats/data/Tuple2K.scala
@@ -109,18 +109,16 @@ private[data] sealed abstract class Tuple2KInstances6 extends Tuple2KInstances7
 }
 
 private[data] sealed abstract class Tuple2KInstances7 extends Tuple2KInstances8 {
-
-  implicit def catsDataFunctorForTuple2K[F[_], G[_]](implicit FF: Functor[F], GG: Functor[G]): Functor[λ[α => Tuple2K[F, G, α]]] = new Tuple2KFunctor[F, G] {
-    def F: Functor[F] = FF
-    def G: Functor[G] = GG
+  implicit def catsDataDistributiveForTuple2K[F[_], G[_]](implicit FF: Distributive[F], GG: Distributive[G]): Distributive[λ[α => Tuple2K[F, G, α]]] = new Tuple2KDistributive[F, G] {
+    def F: Distributive[F] = FF
+    def G: Distributive[G] = GG
   }
 }
 
 private[data] sealed abstract class Tuple2KInstances8 {
-
-  implicit def catsDataDistributiveForTuple2K[F[_], G[_]](implicit FF: Distributive[F], GG: Distributive[G]): Distributive[λ[α => Tuple2K[F, G, α]]] = new Tuple2KDistributive[F, G] {
-    def F: Distributive[F] = FF
-    def G: Distributive[G] = GG
+  implicit def catsDataFunctorForTuple2K[F[_], G[_]](implicit FF: Functor[F], GG: Functor[G]): Functor[λ[α => Tuple2K[F, G, α]]] = new Tuple2KFunctor[F, G] {
+    def F: Functor[F] = FF
+    def G: Functor[G] = GG
   }
 }
 

diff --git a/core/src/main/scala/cats/instances/function.scala b/core/src/main/scala/cats/instances/function.scala
@@ -108,7 +108,7 @@ private[instances] sealed trait Function1Instances0 {
         fa.compose(f)
     }
 
-  implicit def functior1Distributive[T1]: Distributive[T1 => ?] = new Distributive[T1 => ?] {
+  implicit def catsStdDistributiveForFunction1[T1]: Distributive[T1 => ?] = new Distributive[T1 => ?] {
     def distribute[F[_]: Functor, A, B](fa: F[A])(f: A => (T1 => B)): T1 => F[B] = {t1 => Functor[F].map(fa)(a => f(a)(t1)) }
 
     def map[A, B](fa: T1 => A)(f: A => B): T1 => B = {t1 => f(fa(t1))}

diff --git a/tests/src/test/scala/cats/tests/KleisliSuite.scala b/tests/src/test/scala/cats/tests/KleisliSuite.scala
@@ -115,7 +115,7 @@ class KleisliSuite extends CatsSuite {
 
   {
     checkAll("Kleisli[Function0, Int, ?]", DistributiveTests[Kleisli[Function0, Int, ?]].distributive[Int, Int, Int, Option, Id])
-    checkAll("Distributive[Kleisli[Option, Int, ?]]", SerializableTests.serializable(Distributive[Kleisli[Function0, Int, ?]]))
+    checkAll("Distributive[Kleisli[Function0, Int, ?]]", SerializableTests.serializable(Distributive[Kleisli[Function0, Int, ?]]))
   }
 
   {