upgrade zio version (#338)

Author: adamgfraser

build.sbt

@@ -23,7 +23,7 @@ inThisBuild(
 addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
 
-val zioVersion = "2.0.0-RC5"
+val zioVersion = "2.0.0-RC6"
 
 lazy val root = project
   .in(file("."))

docs/overview/creating_data_sources.md

@@ -28,7 +28,7 @@ Now let's build the corresponding `DataSource`. We will create a `Batched` data
 ```scala mdoc:silent
 lazy val UserDataSource = new DataSource.Batched[Any, GetUserName] {
   val identifier: String = ???
-  def run(requests: Chunk[GetUserName])(implicit trace: ZTraceElement): ZIO[Any, Nothing, CompletedRequestMap] = ???
+  def run(requests: Chunk[GetUserName])(implicit trace: Trace): ZIO[Any, Nothing, CompletedRequestMap] = ???
 }
 ```
 

zio-query/shared/src/main/scala/zio/query/Cache.scala

@@ -1,6 +1,6 @@
 package zio.query
 
-import zio.{ IO, Ref, UIO, ZIO, ZTraceElement }
+import zio.{ IO, Ref, Trace, UIO, ZIO }
 import zio.stacktracer.TracingImplicits.disableAutoTrace
 
 /**
@@ -17,7 +17,7 @@ trait Cache {
    * in the cache but has not been executed yet, or `Ref(Some(value))` if the
    * request has been executed.
    */
-  def get[E, A](request: Request[E, A])(implicit trace: ZTraceElement): IO[Unit, Ref[Option[Either[E, A]]]]
+  def get[E, A](request: Request[E, A])(implicit trace: Trace): IO[Unit, Ref[Option[Either[E, A]]]]
 
   /**
    * Looks up a request in the cache. If the request is not in the cache
@@ -28,37 +28,37 @@ trait Cache {
    */
   def lookup[R, E, A, B](request: A)(implicit
     ev: A <:< Request[E, B],
-    trace: ZTraceElement
+    trace: Trace
   ): UIO[Either[Ref[Option[Either[E, B]]], Ref[Option[Either[E, B]]]]]
 
   /**
    * Inserts a request and a `Ref` that will contain the result of the request
    * when it is executed into the cache.
    */
-  def put[E, A](request: Request[E, A], result: Ref[Option[Either[E, A]]])(implicit trace: ZTraceElement): UIO[Unit]
+  def put[E, A](request: Request[E, A], result: Ref[Option[Either[E, A]]])(implicit trace: Trace): UIO[Unit]
 
   /**
    * Removes a request from the cache.
    */
-  def remove[E, A](request: Request[E, A])(implicit trace: ZTraceElement): UIO[Unit]
+  def remove[E, A](request: Request[E, A])(implicit trace: Trace): UIO[Unit]
 }
 
 object Cache {
 
   /**
    * Constructs an empty cache.
    */
-  def empty(implicit trace: ZTraceElement): UIO[Cache] =
+  def empty(implicit trace: Trace): UIO[Cache] =
     ZIO.succeed(Cache.unsafeMake())
 
   private final class Default(private val state: Ref[Map[Any, Any]]) extends Cache {
 
-    def get[E, A](request: Request[E, A])(implicit trace: ZTraceElement): IO[Unit, Ref[Option[Either[E, A]]]] =
+    def get[E, A](request: Request[E, A])(implicit trace: Trace): IO[Unit, Ref[Option[Either[E, A]]]] =
       state.get.map(_.get(request).asInstanceOf[Option[Ref[Option[Either[E, A]]]]]).some.orElseFail(())
 
     def lookup[R, E, A, B](request: A)(implicit
       ev: A <:< Request[E, B],
-      trace: ZTraceElement
+      trace: Trace
     ): UIO[Either[Ref[Option[Either[E, B]]], Ref[Option[Either[E, B]]]]] =
       Ref.make(Option.empty[Either[E, B]]).flatMap { ref =>
         state.modify { map =>
@@ -69,10 +69,10 @@ object Cache {
         }
       }
 
-    def put[E, A](request: Request[E, A], result: Ref[Option[Either[E, A]]])(implicit trace: ZTraceElement): UIO[Unit] =
+    def put[E, A](request: Request[E, A], result: Ref[Option[Either[E, A]]])(implicit trace: Trace): UIO[Unit] =
       state.update(_ + (request -> result))
 
-    def remove[E, A](request: Request[E, A])(implicit trace: ZTraceElement): UIO[Unit] =
+    def remove[E, A](request: Request[E, A])(implicit trace: Trace): UIO[Unit] =
       state.update(_ - request)
   }
 

zio-query/shared/src/main/scala/zio/query/DataSource.scala

@@ -1,6 +1,6 @@
 package zio.query
 
-import zio.{ Chunk, ZEnvironment, ZIO, ZTraceElement }
+import zio.{ Chunk, Trace, ZEnvironment, ZIO }
 import zio.stacktracer.TracingImplicits.disableAutoTrace
 
 /**
@@ -36,15 +36,15 @@ trait DataSource[-R, -A] { self =>
    * of requests that must be performed sequentially. The inner `Chunk`
    * represents a batch of requests that can be performed in parallel.
    */
-  def runAll(requests: Chunk[Chunk[A]])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap]
+  def runAll(requests: Chunk[Chunk[A]])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap]
 
   /**
    * Returns a data source that executes at most `n` requests in parallel.
    */
   def batchN(n: Int): DataSource[R, A] =
     new DataSource[R, A] {
       val identifier = s"${self}.batchN($n)"
-      def runAll(requests: Chunk[Chunk[A]])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[A]])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         if (n < 1)
           ZIO.die(new IllegalArgumentException("batchN: n must be at least 1"))
         else
@@ -59,7 +59,7 @@ trait DataSource[-R, -A] { self =>
   final def contramap[B](f: Described[B => A]): DataSource[R, B] =
     new DataSource[R, B] {
       val identifier = s"${self.identifier}.contramap(${f.description})"
-      def runAll(requests: Chunk[Chunk[B]])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[B]])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         self.runAll(requests.map(_.map(f.value)))
     }
 
@@ -80,7 +80,7 @@ trait DataSource[-R, -A] { self =>
   final def contramapZIO[R1 <: R, B](f: Described[B => ZIO[R1, Nothing, A]]): DataSource[R1, B] =
     new DataSource[R1, B] {
       val identifier = s"${self.identifier}.contramapZIO(${f.description})"
-      def runAll(requests: Chunk[Chunk[B]])(implicit trace: ZTraceElement): ZIO[R1, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[B]])(implicit trace: Trace): ZIO[R1, Nothing, CompletedRequestMap] =
         ZIO.foreach(requests)(ZIO.foreachPar(_)(f.value)).flatMap(self.runAll)
     }
 
@@ -94,7 +94,7 @@ trait DataSource[-R, -A] { self =>
   )(f: Described[C => Either[A, B]]): DataSource[R1, C] =
     new DataSource[R1, C] {
       val identifier = s"${self.identifier}.eitherWith(${that.identifier})(${f.description})"
-      def runAll(requests: Chunk[Chunk[C]])(implicit trace: ZTraceElement): ZIO[R1, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[C]])(implicit trace: Trace): ZIO[R1, Nothing, CompletedRequestMap] =
         ZIO
           .foreach(requests) { requests =>
             val (as, bs) = requests.partitionMap(f.value)
@@ -143,7 +143,7 @@ trait DataSource[-R, -A] { self =>
   ): DataSource[R0, A] =
     new DataSource[R0, A] {
       val identifier = s"${self.identifier}.provideSomeEnvironment(${f.description})"
-      def runAll(requests: Chunk[Chunk[A]])(implicit trace: ZTraceElement): ZIO[R0, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[A]])(implicit trace: Trace): ZIO[R0, Nothing, CompletedRequestMap] =
         self.runAll(requests).provideSomeEnvironment(f.value)
     }
 
@@ -155,7 +155,7 @@ trait DataSource[-R, -A] { self =>
   final def race[R1 <: R, A1 <: A](that: DataSource[R1, A1]): DataSource[R1, A1] =
     new DataSource[R1, A1] {
       val identifier = s"${self.identifier}.race(${that.identifier})"
-      def runAll(requests: Chunk[Chunk[A1]])(implicit trace: ZTraceElement): ZIO[R1, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[A1]])(implicit trace: Trace): ZIO[R1, Nothing, CompletedRequestMap] =
         self.runAll(requests).race(that.runAll(requests))
     }
 
@@ -171,8 +171,8 @@ object DataSource {
    * performed sequentially.
    */
   trait Batched[-R, -A] extends DataSource[R, A] {
-    def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap]
-    final def runAll(requests: Chunk[Chunk[A]])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+    def run(requests: Chunk[A])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap]
+    final def runAll(requests: Chunk[Chunk[A]])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
       ZIO.foldLeft(requests)(CompletedRequestMap.empty) { case (completedRequestMap, requests) =>
         val newRequests = requests.filterNot(completedRequestMap.contains)
         if (newRequests.isEmpty) ZIO.succeedNow(completedRequestMap)
@@ -189,7 +189,7 @@ object DataSource {
     def make[R, A](name: String)(f: Chunk[A] => ZIO[R, Nothing, CompletedRequestMap]): DataSource[R, A] =
       new DataSource.Batched[R, A] {
         val identifier: String = name
-        def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+        def run(requests: Chunk[A])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
           f(requests)
       }
   }
@@ -202,7 +202,7 @@ object DataSource {
   )(f: A => B)(implicit ev: A <:< Request[Nothing, B]): DataSource[Any, A] =
     new DataSource.Batched[Any, A] {
       val identifier: String = name
-      def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[Any, Nothing, CompletedRequestMap] =
+      def run(requests: Chunk[A])(implicit trace: Trace): ZIO[Any, Nothing, CompletedRequestMap] =
         ZIO.succeedNow(requests.foldLeft(CompletedRequestMap.empty)((map, k) => map.insert(k)(Right(f(k)))))
     }
 
@@ -263,7 +263,7 @@ object DataSource {
   )(f: Chunk[A] => ZIO[R, E, Chunk[Option[B]]])(implicit ev: A <:< Request[E, B]): DataSource[R, A] =
     new DataSource.Batched[R, A] {
       val identifier: String = name
-      def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def run(requests: Chunk[A])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         f(requests)
           .fold(
             e => requests.map((_, Left(e))),
@@ -317,7 +317,7 @@ object DataSource {
   ): DataSource[R, A] =
     new DataSource.Batched[R, A] {
       val identifier: String = name
-      def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def run(requests: Chunk[A])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         f(requests)
           .fold(
             e => requests.map(a => (ev(a), Left(e))),
@@ -339,7 +339,7 @@ object DataSource {
   )(f: Chunk[A] => ZIO[R, E, Chunk[B]])(implicit ev: A <:< Request[E, B]): DataSource[R, A] =
     new DataSource.Batched[R, A] {
       val identifier: String = name
-      def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def run(requests: Chunk[A])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         f(requests)
           .fold(
             e => requests.map((_, Left(e))),
@@ -367,7 +367,7 @@ object DataSource {
   )(f: A => ZIO[R, E, B])(implicit ev: A <:< Request[E, B]): DataSource[R, A] =
     new DataSource.Batched[R, A] {
       val identifier: String = name
-      def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def run(requests: Chunk[A])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         ZIO
           .foreachPar(requests)(a => f(a).either.map((a, _)))
           .map(_.foldLeft(CompletedRequestMap.empty) { case (map, (k, v)) => map.insert(k)(v) })
@@ -401,7 +401,7 @@ object DataSource {
   )(f: A => ZIO[R, E, Option[B]])(implicit ev: A <:< Request[E, B]): DataSource[R, A] =
     new DataSource.Batched[R, A] {
       val identifier: String = name
-      def run(requests: Chunk[A])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def run(requests: Chunk[A])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         ZIO
           .foreachPar(requests)(a => f(a).either.map((a, _)))
           .map(_.foldLeft(CompletedRequestMap.empty) { case (map, (k, v)) =>
@@ -416,7 +416,7 @@ object DataSource {
   def make[R, A](name: String)(f: Chunk[Chunk[A]] => ZIO[R, Nothing, CompletedRequestMap]): DataSource[R, A] =
     new DataSource[R, A] {
       val identifier: String = name
-      def runAll(requests: Chunk[Chunk[A]])(implicit trace: ZTraceElement): ZIO[R, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[A]])(implicit trace: Trace): ZIO[R, Nothing, CompletedRequestMap] =
         f(requests)
     }
 
@@ -426,7 +426,7 @@ object DataSource {
   val never: DataSource[Any, Any] =
     new DataSource[Any, Any] {
       val identifier = "never"
-      def runAll(requests: Chunk[Chunk[Any]])(implicit trace: ZTraceElement): ZIO[Any, Nothing, CompletedRequestMap] =
+      def runAll(requests: Chunk[Chunk[Any]])(implicit trace: Trace): ZIO[Any, Nothing, CompletedRequestMap] =
         ZIO.never
     }
 }

zio-query/shared/src/main/scala/zio/query/DataSourceAspect.scala

@@ -1,6 +1,6 @@
 package zio.query
 
-import zio.{ Chunk, ZIO, ZTraceElement }
+import zio.{ Chunk, Trace, ZIO }
 import zio.stacktracer.TracingImplicits.disableAutoTrace
 
 /**
@@ -45,8 +45,8 @@ object DataSourceAspect {
       def apply[R1 <: R, A](dataSource: DataSource[R1, A]): DataSource[R1, A] =
         new DataSource[R1, A] {
           val identifier = s"${dataSource.identifier} @@ around(${before.description})(${after.description})"
-          def runAll(requests: Chunk[Chunk[A]])(implicit trace: ZTraceElement): ZIO[R1, Nothing, CompletedRequestMap] =
-            before.value.acquireReleaseWith(after.value)(_ => dataSource.runAll(requests))
+          def runAll(requests: Chunk[Chunk[A]])(implicit trace: Trace): ZIO[R1, Nothing, CompletedRequestMap] =
+            ZIO.acquireReleaseWith(before.value)(after.value)(_ => dataSource.runAll(requests))
         }
     }