Make Future a CommutativeMonad

typelevel · Sep 28, 2017 · edd6ba8 · edd6ba8
1 parent 0ea4ac0
commit edd6ba8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/scala/cats/instances/future.scala b/core/src/main/scala/cats/instances/future.scala
@@ -6,8 +6,8 @@ import scala.concurrent.{ExecutionContext, Future}
 
 trait FutureInstances extends FutureInstances1 {
 
-  implicit def catsStdInstancesForFuture(implicit ec: ExecutionContext): MonadError[Future, Throwable] with CoflatMap[Future] with Monad[Future] =
-    new FutureCoflatMap with MonadError[Future, Throwable] with Monad[Future] with StackSafeMonad[Future] {
+  implicit def catsStdInstancesForFuture(implicit ec: ExecutionContext): MonadError[Future, Throwable] with CoflatMap[Future] with CommutativeMonad[Future] =
+    new FutureCoflatMap with MonadError[Future, Throwable] with CommutativeMonad[Future] with StackSafeMonad[Future] {
       def pure[A](x: A): Future[A] = Future.successful(x)
 
       def flatMap[A, B](fa: Future[A])(f: A => Future[B]): Future[B] = fa.flatMap(f)

diff --git a/js/src/test/scala/cats/tests/FutureTests.scala b/js/src/test/scala/cats/tests/FutureTests.scala
@@ -54,7 +54,7 @@ class FutureTests extends CatsSuite {
 
   checkAll("Future[Int]", MonadErrorTests[Future, Throwable].monadError[Int, Int, Int])
   checkAll("Future[Int]", ComonadTests[Future].comonad[Int, Int, Int])
-  checkAll("Future", MonadTests[Future].monad[Int, Int, Int])
+  checkAll("Future", CommutativeMonadTests[Future].commutativeMonad[Int, Int, Int])
 
   {
     implicit val F = ListWrapper.semigroup[Int]

diff --git a/jvm/src/test/scala/cats/tests/FutureTests.scala b/jvm/src/test/scala/cats/tests/FutureTests.scala
@@ -39,7 +39,7 @@ class FutureTests extends CatsSuite {
     Arbitrary(arbitrary[Exception].map(identity))
 
   checkAll("Future with Throwable", MonadErrorTests[Future, Throwable].monadError[Int, Int, Int])
-  checkAll("Future", MonadTests[Future].monad[Int, Int, Int])
+  checkAll("Future", CommutativeMonadTests[Future].commutativeMonad[Int, Int, Int])
   checkAll("Future", CoflatMapTests[Future].coflatMap[Int, Int, Int])
 
   {