Fix a few more errors

frees-io · Sep 28, 2017 · 4a25d11 · 4a25d11
1 parent 60e1de8
commit 4a25d11
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/modules/core/src/main/scala/iota/Cop.scala b/modules/core/src/main/scala/iota/Cop.scala
@@ -41,7 +41,8 @@ object Cop {
   /** A type class witnessing the ability to inject type `A` into a
     * coproduct of types `B`
     */
-  sealed abstract class Inject[A, B <: Cop[_]] extends cats.Inject[A, B]
+  sealed abstract class Inject[A, B <: Cop[_]]
+      extends cats.Inject[A, B] //#=cats
 
   object Inject {
     def apply[A, B <: Cop[_]](implicit ev: Inject[A, B]): Inject[A, B] = ev

diff --git a/modules/core/src/main/scala/iota/CopK.scala b/modules/core/src/main/scala/iota/CopK.scala
@@ -45,8 +45,7 @@ object CopK {
     * into a coproduct of type constructors `G`
     */
   sealed abstract class Inject[F[_], G[_] <: CopK[_, _]]
-      extends cats.InjectK[F, G]  //#=cats
-      extends scalaz.Inject[F, G] //#=scalaz
+      extends cats.InjectK[F, G] //#=cats
 
   object Inject {
     def apply[F[_], G[_] <: CopK[_, _]](implicit ev: Inject[F, G]): Inject[F, G] = ev

diff --git a/modules/core/src/main/scala/iota/internal/CopKFunctionKMacros.scala b/modules/core/src/main/scala/iota/internal/CopKFunctionKMacros.scala
@@ -27,6 +27,7 @@ import cats.syntax.either._ //#=2.12
 
 //#+scalaz
 import scalaz._
+import scalaz.std.list._
 //#-scalaz
 
 import scala.reflect.macros.whitebox.Context

diff --git a/modules/core/src/main/scala/iota/internal/catryoshka.scala b/modules/core/src/main/scala/iota/internal/catryoshka.scala
@@ -72,7 +72,7 @@ private[internal] object catryoshka {
     (implicit M: Monad[M], F: Traverse[F])
       : M[B] =
     hylo[ λ[α => M[F[α]]], A, M[B] ](a)(
-      fb => M.flatMap(fb)(b => M.flatMap(F.sequence(b))(algM)),
+      fb => fb >>= (b => b.sequence >>= algM),
       coalgM)(M compose F)
 
   trait Based[T] {