Update SemigroupK/MonoidK composition

Per feedback on typelevel#757.
ceedubs · Jan 31, 2016 · 58b3f5b · 58b3f5b
1 parent caf7250
commit 58b3f5b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/core/src/main/scala/cats/Alternative.scala b/core/src/main/scala/cats/Alternative.scala
@@ -3,8 +3,9 @@ package cats
 import simulacrum.typeclass
 
 @typeclass trait Alternative[F[_]] extends Applicative[F] with MonoidK[F] { self =>
+
   /**
-   * Compose two Alternative intsances.
+   * Compose this `Alternative` instance with an [[Applicative]] instance.
    */
   override def compose[G[_]](implicit GG: Applicative[G]): Alternative[λ[α => F[G[α]]]] =
     new CompositeAlternative[F, G] {

diff --git a/core/src/main/scala/cats/MonoidK.scala b/core/src/main/scala/cats/MonoidK.scala
@@ -32,16 +32,11 @@ import simulacrum.typeclass
   /**
    * Compose this MonoidK with an arbitrary type constructor
    */
-  override def composedWith[G[_]]: MonoidK[λ[α => F[G[α]]]] =
+  override def composeK[G[_]]: MonoidK[λ[α => F[G[α]]]] =
     new CompositeMonoidK[F, G] {
       implicit def F: MonoidK[F] = self
     }
 
-  /**
-   * Compose two MonoidK instances.
-   */
-  def compose[G[_]](implicit GG: MonoidK[G]): MonoidK[λ[α => F[G[α]]]] = composedWith[G]
-
   /**
    * Given a type A, create a concrete Monoid[F[A]].
    */

diff --git a/core/src/main/scala/cats/SemigroupK.scala b/core/src/main/scala/cats/SemigroupK.scala
@@ -31,16 +31,11 @@ import simulacrum.{op, typeclass}
   /**
    * Compose this SemigroupK with an arbitrary type constructor
    */
-  def composedWith[G[_]]: SemigroupK[λ[α => F[G[α]]]] =
+  def composeK[G[_]]: SemigroupK[λ[α => F[G[α]]]] =
     new CompositeSemigroupK[F, G] {
       implicit def F: SemigroupK[F] = self
     }
 
-  /**
-   * Compose two SemigroupK instances.
-   */
-  def compose[G[_]](implicit GG: SemigroupK[G]): SemigroupK[λ[α => F[G[α]]]] = composedWith[G]
-
   /**
    * Given a type A, create a concrete Semigroup[F[A]].
    */

diff --git a/tests/src/test/scala/cats/tests/ComposeTests.scala b/tests/src/test/scala/cats/tests/ComposeTests.scala
@@ -41,7 +41,7 @@ class ComposeTests extends CatsSuite {
   {
     // MonoidK composition
 
-    implicit val monoidKListVector: MonoidK[Lambda[A => List[Vector[A]]]] = MonoidK[List] compose MonoidK[Vector]
+    implicit val monoidKListVector: MonoidK[Lambda[A => List[Vector[A]]]] = MonoidK[List].composeK[Vector]
 
     checkAll("MonoidK[Lambda[A => List[Vector[A]]]]", MonoidKTests[Lambda[A => List[Vector[A]]]].monoidK[Int])
   }
@@ -59,7 +59,7 @@ class ComposeTests extends CatsSuite {
   {
     // SemigroupK composition
 
-    implicit val semigroupKListVector: SemigroupK[Lambda[A => List[Vector[A]]]] = SemigroupK[List] compose SemigroupK[Vector]
+    implicit val semigroupKListVector: SemigroupK[Lambda[A => List[Vector[A]]]] = SemigroupK[List].composeK[Vector]
 
     checkAll("SemigroupK[Lambda[A => List[Vector[A]]]]", SemigroupKTests[Lambda[A => List[Vector[A]]]].semigroupK[Int])
   }