From 141ded18ec5f38b9ccf1f1e4802fa6e6e24c9c1b Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Sun, 12 Feb 2023 10:14:30 -0800 Subject: [PATCH 1/4] deprecate zio succeed now --- core/shared/src/main/scala/zio/ZIO.scala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/shared/src/main/scala/zio/ZIO.scala b/core/shared/src/main/scala/zio/ZIO.scala index cdd144c039d3..5a6140f7b634 100644 --- a/core/shared/src/main/scala/zio/ZIO.scala +++ b/core/shared/src/main/scala/zio/ZIO.scala @@ -5792,6 +5792,10 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific private[zio] val someDebug = Some(LogLevel.Debug) private[zio] val someTrace = Some(LogLevel.Trace) + @deprecated("use succeed", "2.0.9") + private[zio] def succeedNow[A](a: A): UIO[A] = + ZIO.succeed(a) + private def collectAllParUnboundedDiscard[R, E, A](as: => Iterable[ZIO[R, E, A]])(implicit trace: Trace ): ZIO[R, E, Unit] = From 02a0a71022641746de9d67906d76c4b7c18a92b8 Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Sun, 12 Feb 2023 10:19:25 -0800 Subject: [PATCH 2/4] deprecate zmanaged succeed now --- core/shared/src/main/scala/zio/ZIO.scala | 4 ++-- managed/shared/src/main/scala/zio/managed/ZManaged.scala | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/shared/src/main/scala/zio/ZIO.scala b/core/shared/src/main/scala/zio/ZIO.scala index 5a6140f7b634..d3c279d9d6b0 100644 --- a/core/shared/src/main/scala/zio/ZIO.scala +++ b/core/shared/src/main/scala/zio/ZIO.scala @@ -5794,7 +5794,7 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific @deprecated("use succeed", "2.0.9") private[zio] def succeedNow[A](a: A): UIO[A] = - ZIO.succeed(a) + succeed(a) private def collectAllParUnboundedDiscard[R, E, A](as: => Iterable[ZIO[R, E, A]])(implicit trace: Trace @@ -5810,7 +5810,7 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific val array = Array.ofDim[AnyRef](as.size) val zioFunction: ((A, Int)) => ZIO[R, E, Any] = { case (a, i) => fn(a).flatMap(b => ZIO.succeed(array(i) = b.asInstanceOf[AnyRef])) - } + } foreachParDiscard(n)(as.zipWithIndex)(zioFunction) *> ZIO.succeed(bf.fromSpecific(as)(array.asInstanceOf[Array[B]])) } diff --git a/managed/shared/src/main/scala/zio/managed/ZManaged.scala b/managed/shared/src/main/scala/zio/managed/ZManaged.scala index 45a46cc0ea13..9b683f8fa690 100644 --- a/managed/shared/src/main/scala/zio/managed/ZManaged.scala +++ b/managed/shared/src/main/scala/zio/managed/ZManaged.scala @@ -2894,6 +2894,10 @@ object ZManaged extends ZManagedPlatformSpecific { } } + @deprecated("use succeed", "2.0.9") + private[zio] def succeedNow[A](r: A): ZManaged[Any, Nothing, A] = + succeed(r) + implicit final class RefineToOrDieOps[R, E <: Throwable, A](private val self: ZManaged[R, E, A]) extends AnyVal { /** From c9d39086a1e2ae33d3673ebd233cae09627b07f2 Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Sun, 12 Feb 2023 10:20:08 -0800 Subject: [PATCH 3/4] cleanup --- core/shared/src/main/scala/zio/ZIO.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/shared/src/main/scala/zio/ZIO.scala b/core/shared/src/main/scala/zio/ZIO.scala index d3c279d9d6b0..7b560cf1a607 100644 --- a/core/shared/src/main/scala/zio/ZIO.scala +++ b/core/shared/src/main/scala/zio/ZIO.scala @@ -5810,7 +5810,7 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific val array = Array.ofDim[AnyRef](as.size) val zioFunction: ((A, Int)) => ZIO[R, E, Any] = { case (a, i) => fn(a).flatMap(b => ZIO.succeed(array(i) = b.asInstanceOf[AnyRef])) - } + } foreachParDiscard(n)(as.zipWithIndex)(zioFunction) *> ZIO.succeed(bf.fromSpecific(as)(array.asInstanceOf[Array[B]])) } From 00262353da68b9171dec5520d4f33e01029670bc Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Sun, 12 Feb 2023 10:34:57 -0800 Subject: [PATCH 4/4] add trace --- core/shared/src/main/scala/zio/ZIO.scala | 2 +- managed/shared/src/main/scala/zio/managed/ZManaged.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/shared/src/main/scala/zio/ZIO.scala b/core/shared/src/main/scala/zio/ZIO.scala index 7b560cf1a607..b672b687988d 100644 --- a/core/shared/src/main/scala/zio/ZIO.scala +++ b/core/shared/src/main/scala/zio/ZIO.scala @@ -5794,7 +5794,7 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific @deprecated("use succeed", "2.0.9") private[zio] def succeedNow[A](a: A): UIO[A] = - succeed(a) + succeed(a)(Trace.empty) private def collectAllParUnboundedDiscard[R, E, A](as: => Iterable[ZIO[R, E, A]])(implicit trace: Trace diff --git a/managed/shared/src/main/scala/zio/managed/ZManaged.scala b/managed/shared/src/main/scala/zio/managed/ZManaged.scala index 9b683f8fa690..1f1f628c149d 100644 --- a/managed/shared/src/main/scala/zio/managed/ZManaged.scala +++ b/managed/shared/src/main/scala/zio/managed/ZManaged.scala @@ -2896,7 +2896,7 @@ object ZManaged extends ZManagedPlatformSpecific { @deprecated("use succeed", "2.0.9") private[zio] def succeedNow[A](r: A): ZManaged[Any, Nothing, A] = - succeed(r) + succeed(r)(Trace.empty) implicit final class RefineToOrDieOps[R, E <: Throwable, A](private val self: ZManaged[R, E, A]) extends AnyVal {