Merge pull request #171 from alexandru/remove-andthen

Remove AndThen, as StateT was fixed in Cats 1.1
typelevel · Mar 24, 2018 · e46d4b9 · e46d4b9
2 parents 70ff976 + 3a9bbd3
commit e46d4b9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 222 deletions.
diff --git a/core/shared/src/main/scala/cats/effect/Sync.scala b/core/shared/src/main/scala/cats/effect/Sync.scala
@@ -19,7 +19,7 @@ package effect
 
 import simulacrum._
 import cats.data._
-import cats.effect.internals.{AndThen, NonFatal}
+import cats.effect.internals.NonFatal
 import cats.syntax.all._
 
 /**
@@ -176,19 +176,8 @@ object Sync {
     def raiseError[A](e: Throwable): StateT[F, S, A] =
       StateT.liftF(F.raiseError(e))
 
-    override def map[A, B](fa: StateT[F, S, A])(f: A => B): StateT[F, S, B] =
-      IndexedStateT.applyF[F, S, S, B](F.map(fa.runF) { safsba =>
-        AndThen(safsba).andThen(fa => F.map(fa) { case (s, a) => (s, f(a)) })
-      })
-
     def flatMap[A, B](fa: StateT[F, S, A])(f: A => StateT[F, S, B]): StateT[F, S, B] =
-      IndexedStateT.applyF[F, S, S, B](F.map(fa.runF) { safsba =>
-        AndThen(safsba).andThen { fsba =>
-          F.flatMap(fsba) { case (sb, a) =>
-            f(a).run(sb)
-          }
-        }
-      })
+      fa.flatMap(f)
 
     // overwriting the pre-existing one, since flatMap is guaranteed stack-safe
     def tailRecM[A, B](a: A)(f: A => StateT[F, S, Either[A, B]]): StateT[F, S, B] =

diff --git a/core/shared/src/main/scala/cats/effect/internals/AndThen.scala b/core/shared/src/main/scala/cats/effect/internals/AndThen.scala
diff --git a/core/shared/src/test/scala/cats/effect/internals/AndThenTests.scala b/core/shared/src/test/scala/cats/effect/internals/AndThenTests.scala