Merge branch 'main' into renovate/major-all

arrow-kt · Feb 17, 2023 · d593bf0 · d593bf0
2 parents 29ac749 + 1d6a6aa
commit d593bf0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Either.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Either.kt
@@ -2069,10 +2069,10 @@ public inline fun <A, B> Either<A, B>.getOrHandle(default: (A) -> B): B =
  */
 @Deprecated(
   RedundantAPI + "Prefer if-else statement inside either DSL, or replace with explicit flatMap",
-  ReplaceWith("flatMap { b -> b.takeIf(predicate)?.right() ?: default().left() }")
+  ReplaceWith("flatMap { if (predicate(it)) Right(it) else Left(default(it)) }")
 )
 public inline fun <A, B> Either<A, B>.filterOrElse(predicate: (B) -> Boolean, default: () -> A): Either<A, B> =
-  ensure(default, predicate)
+  flatMap { if (predicate(it)) Right(it) else Left(default()) }
 
 /**
  * Returns [Right] with the existing value of [Right] if this is a [Right] and the given