Move Compose instance for Map to separate trait

Fix binary compatibility issues by moving the new Compose instance for Map to a separate trait.
typelevel · Aug 14, 2018 · c6abd50 · c6abd50
1 parent 284b183
commit c6abd50
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/core/src/main/scala/cats/implicits.scala b/core/src/main/scala/cats/implicits.scala
@@ -7,3 +7,4 @@ object implicits
     with syntax.AllSyntaxBinCompat2
     with instances.AllInstances
     with instances.AllInstancesBinCompat0
+    with instances.AllInstancesBinCompat1
diff --git a/core/src/main/scala/cats/instances/all.scala b/core/src/main/scala/cats/instances/all.scala
@@ -36,3 +36,6 @@ trait AllInstances
 trait AllInstancesBinCompat0
     extends FunctionInstancesBinCompat0
     with    Tuple2InstancesBinCompat0
+
+trait AllInstancesBinCompat1
+    extends MapInstancesBinCompat0
diff --git a/core/src/main/scala/cats/instances/map.scala b/core/src/main/scala/cats/instances/map.scala
@@ -81,6 +81,10 @@ trait MapInstances extends cats.kernel.instances.MapInstances {
     }
   // scalastyle:on method.length
 
+}
+
+trait MapInstancesBinCompat0 {
+
   implicit def catsStdComposeForMap: Compose[Map] = new Compose[Map] {
 
     def compose[A, B, C](f: Map[B, C], g: Map[A, B]): Map[A, C] = {
@@ -94,4 +98,5 @@ trait MapInstances extends cats.kernel.instances.MapInstances {
     }
 
   }
+
 }
diff --git a/core/src/main/scala/cats/instances/package.scala b/core/src/main/scala/cats/instances/package.scala
@@ -1,7 +1,7 @@
 package cats
 
 package object instances {
-  object all             extends AllInstances with AllInstancesBinCompat0
+  object all             extends AllInstances with AllInstancesBinCompat0 with AllInstancesBinCompat1
   object bigInt          extends BigIntInstances
   object bigDecimal      extends BigDecimalInstances
   object bitSet          extends BitSetInstances
@@ -21,7 +21,7 @@ package object instances {
   object invariant       extends InvariantMonoidalInstances
   object list            extends ListInstances
   object long            extends LongInstances
-  object map             extends MapInstances
+  object map             extends MapInstances with MapInstancesBinCompat0
   object option          extends OptionInstances
   object order           extends OrderInstances
   object ordering        extends OrderingInstances

diff --git a/testkit/src/main/scala/cats/tests/CatsSuite.scala b/testkit/src/main/scala/cats/tests/CatsSuite.scala
@@ -2,7 +2,7 @@ package cats
 package tests
 
 import catalysts.Platform
-import cats.instances.{AllInstances, AllInstancesBinCompat0}
+import cats.instances.{AllInstances, AllInstancesBinCompat0, AllInstancesBinCompat1}
 import cats.syntax.{AllSyntax, AllSyntaxBinCompat0, AllSyntaxBinCompat1, AllSyntaxBinCompat2, EqOps}
 import org.scalactic.anyvals.{PosInt, PosZDouble, PosZInt}
 import org.scalatest.{FunSuite, FunSuiteLike, Matchers}
@@ -33,7 +33,7 @@ trait CatsSuite extends FunSuite
     with GeneratorDrivenPropertyChecks
     with Discipline
     with TestSettings
-    with AllInstances with AllInstancesBinCompat0
+    with AllInstances with AllInstancesBinCompat0 with AllInstancesBinCompat1
     with AllSyntax with AllSyntaxBinCompat0 with AllSyntaxBinCompat1
     with AllSyntaxBinCompat2
     with StrictCatsEquality { self: FunSuiteLike =>