From fc8ff6abbde84b58e3f034ca2d6284381caf2a37 Mon Sep 17 00:00:00 2001 From: i-walker <46971368+i-walker@users.noreply.github.com> Date: Thu, 30 Jun 2022 15:31:33 +0200 Subject: [PATCH 1/3] add merge function for *Effect --- .../commonMain/kotlin/arrow/core/continuations/EagerEffect.kt | 2 ++ .../src/commonMain/kotlin/arrow/core/continuations/Effect.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/EagerEffect.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/EagerEffect.kt index 3f24402fe05..e5a7269cb54 100644 --- a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/EagerEffect.kt +++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/EagerEffect.kt @@ -200,3 +200,5 @@ private class DefaultEagerEffect(private val f: suspend EagerEffectScope EagerEffect.merge(): A = fold(::identity, ::identity) diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/Effect.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/Effect.kt index ee493d3a488..e0bbf54beb5 100644 --- a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/Effect.kt +++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/continuations/Effect.kt @@ -788,3 +788,5 @@ private class DefaultEffect(private val f: suspend EffectScope.() -> A) } } } + +public suspend fun Effect.merge(): A = fold(::identity, ::identity) From ac2fcc7ff9f3ba095dd1dc7d2ebca6b3ccb3147b Mon Sep 17 00:00:00 2001 From: i-walker Date: Thu, 30 Jun 2022 13:35:37 +0000 Subject: [PATCH 2/3] Update API files --- arrow-libs/core/arrow-core/api/arrow-core.api | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arrow-libs/core/arrow-core/api/arrow-core.api b/arrow-libs/core/arrow-core/api/arrow-core.api index 3f18274171f..54eaa80bfe4 100644 --- a/arrow-libs/core/arrow-core/api/arrow-core.api +++ b/arrow-libs/core/arrow-core/api/arrow-core.api @@ -2614,6 +2614,7 @@ public final class arrow/core/continuations/EagerEffect$DefaultImpls { public final class arrow/core/continuations/EagerEffectKt { public static final fun eagerEffect (Lkotlin/jvm/functions/Function2;)Larrow/core/continuations/EagerEffect; + public static final fun merge (Larrow/core/continuations/EagerEffect;)Ljava/lang/Object; } public abstract interface class arrow/core/continuations/EagerEffectScope { @@ -2670,6 +2671,7 @@ public final class arrow/core/continuations/Effect$DefaultImpls { public final class arrow/core/continuations/EffectKt { public static final fun effect (Lkotlin/jvm/functions/Function2;)Larrow/core/continuations/Effect; + public static final fun merge (Larrow/core/continuations/Effect;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } public abstract interface class arrow/core/continuations/EffectScope { From ee9a115bf235bb6f087ab64d96d4fa0547d7fb30 Mon Sep 17 00:00:00 2001 From: i-walker <46971368+i-walker@users.noreply.github.com> Date: Thu, 30 Jun 2022 15:36:11 +0200 Subject: [PATCH 3/3] run CI