Applied suggestions from the code review

typelevel · May 3, 2018 · 5f3685d · 5f3685d
1 parent 7dc91ad
commit 5f3685d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/scala/cats/syntax/applicativeError.scala b/core/src/main/scala/cats/syntax/applicativeError.scala
@@ -71,6 +71,6 @@ final class ApplicativeErrorOps[F[_], E, A](val fa: F[A]) extends AnyVal {
   def onError(pf: PartialFunction[E, F[Unit]])(implicit F: ApplicativeError[F, E]): F[A] =
     F.onError(fa)(pf)
 
-  def or(other: F[A])(implicit F: ApplicativeError[F, E]): F[A] =
+  def orElse(other: => F[A])(implicit F: ApplicativeError[F, E]): F[A] =
     F.handleErrorWith(fa)(_ => other)
 }
diff --git a/tests/src/test/scala/cats/tests/ApplicativeErrorSuite.scala b/tests/src/test/scala/cats/tests/ApplicativeErrorSuite.scala
@@ -35,11 +35,11 @@ class ApplicativeErrorSuite extends CatsSuite {
     failed.recoverWith { case _ => Some(7) } should === (Some(7))
   }
 
-  test("or leaves unchanged a success") {
-    17.some or None should === (Some(17))
+  test("orElse leaves a success unchanged") {
+    17.some orElse None should === (Some(17))
   }
 
-  test("or transforms an error to the alternative") {
-    failed or Some(17) should === (Some(17))
+  test("orElse transforms an error to the alternative") {
+    failed orElse Some(17) should === (Some(17))
   }
 }