Merge pull request #1096 from edmundnoble/inject-null

Fix Inject instance and reduceRightToOption null behavior
typelevel · Jun 8, 2016 · 948e85c · 948e85c
2 parents 8f6d2d6 + 86fa9b2
commit 948e85c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/scala/cats/Reducible.scala b/core/src/main/scala/cats/Reducible.scala
@@ -75,7 +75,7 @@ import simulacrum.typeclass
    * Overriden from `Foldable[_]` for efficiency.
    */
   override def reduceRightToOption[A, B](fa: F[A])(f: A => B)(g: (A, Eval[B]) => Eval[B]): Eval[Option[B]] =
-    reduceRightTo(fa)(f)(g).map(Option(_))
+    reduceRightTo(fa)(f)(g).map(Some(_))
 
   /**
    * Traverse `F[A]` using `Apply[G]`.

diff --git a/free/src/main/scala/cats/free/Inject.scala b/free/src/main/scala/cats/free/Inject.scala
@@ -20,14 +20,14 @@ private[free] sealed abstract class InjectInstances {
     new Inject[F, F] {
       def inj[A](fa: F[A]): F[A] = fa
 
-      def prj[A](ga: F[A]): Option[F[A]] = Option(ga)
+      def prj[A](ga: F[A]): Option[F[A]] = Some(ga)
     }
 
   implicit def leftInjectInstance[F[_], G[_]]: Inject[F, Coproduct[F, G, ?]] =
     new Inject[F, Coproduct[F, G, ?]] {
       def inj[A](fa: F[A]): Coproduct[F, G, A] = Coproduct.leftc(fa)
 
-      def prj[A](ga: Coproduct[F, G, A]): Option[F[A]] = ga.run.fold(Option(_), _ => None)
+      def prj[A](ga: Coproduct[F, G, A]): Option[F[A]] = ga.run.fold(Some(_), _ => None)
     }
 
   implicit def rightInjectInstance[F[_], G[_], H[_]](implicit I: Inject[F, G]): Inject[F, Coproduct[H, G, ?]] =