From 26e16e5cb2691ee68e50ce2cb59823d5f4f0b447 Mon Sep 17 00:00:00 2001
From: "P. Oscar Boykin" <boykin@pobox.com>
Date: Mon, 7 Dec 2020 18:00:02 -1000
Subject: [PATCH] Use as rather than map and discard

---
 core/src/main/scala/cats/Apply.scala   | 2 +-
 core/src/main/scala/cats/FlatMap.scala | 4 ++--
 core/src/main/scala/cats/Monad.scala   | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/main/scala/cats/Apply.scala b/core/src/main/scala/cats/Apply.scala
index 155f2cd4aa..fb64a1b93f 100644
--- a/core/src/main/scala/cats/Apply.scala
+++ b/core/src/main/scala/cats/Apply.scala
@@ -73,7 +73,7 @@ trait Apply[F[_]] extends Functor[F] with InvariantSemigroupal[F] with ApplyArit
    * }}}
    */
   def productR[A, B](fa: F[A])(fb: F[B]): F[B] =
-    ap(map(fa)(_ => (b: B) => b))(fb)
+    ap(as(fa, { (b: B) => b }))(fb)
 
   /**
    * Compose two actions, discarding any value produced by the second.
diff --git a/core/src/main/scala/cats/FlatMap.scala b/core/src/main/scala/cats/FlatMap.scala
index fe963c5999..cc7144efaa 100644
--- a/core/src/main/scala/cats/FlatMap.scala
+++ b/core/src/main/scala/cats/FlatMap.scala
@@ -80,7 +80,7 @@ import scala.annotation.implicitNotFound
    * scala> assert(count == 1)
    * }}}
    */
-  def productLEval[A, B](fa: F[A])(fb: Eval[F[B]]): F[A] = flatMap(fa)(a => map(fb.value)(_ => a))
+  def productLEval[A, B](fa: F[A])(fb: Eval[F[B]]): F[A] = flatMap(fa)(a => as(fb.value, a))
 
   @deprecated("Use productLEval instead.", "1.0.0-RC2")
   @noop private[cats] def forEffectEval[A, B](fa: F[A])(fb: Eval[F[B]]): F[A] = productLEval(fa)(fb)
@@ -169,7 +169,7 @@ import scala.annotation.implicitNotFound
   def foreverM[A, B](fa: F[A]): F[B] = {
     // allocate two things once for efficiency.
     val leftUnit = Left(())
-    val stepResult: F[Either[Unit, B]] = map(fa)(_ => leftUnit)
+    val stepResult: F[Either[Unit, B]] = as(fa, leftUnit)
     tailRecM(())(_ => stepResult)
   }
 
diff --git a/core/src/main/scala/cats/Monad.scala b/core/src/main/scala/cats/Monad.scala
index b5a12da490..131c35addf 100644
--- a/core/src/main/scala/cats/Monad.scala
+++ b/core/src/main/scala/cats/Monad.scala
@@ -51,9 +51,7 @@ import scala.annotation.implicitNotFound
     val b = Eval.later(body)
     tailRecM(())(_ =>
       ifM(p)(
-        ifTrue = {
-          map(b.value)(_ => continue)
-        },
+        ifTrue = as(b.value, continue),
         ifFalse = stop
       )
     )