Merge pull request #74 from scala-steward/update/zio-2.0.0-RC6

Update zio, zio-streams, zio-test, ... to 2.0.0-RC6
zio · May 3, 2022 · ec965b6 · ec965b6
2 parents 39e3d64 + 6ca50df
commit ec965b6
Show file tree

Hide file tree

Showing 11 changed files with 720 additions and 646 deletions.
diff --git a/benchmarks/src/test/scala/zio/parser/benchmarks/BenchmarksSpec.scala b/benchmarks/src/test/scala/zio/parser/benchmarks/BenchmarksSpec.scala
@@ -10,7 +10,7 @@ import zio.test._
 
 /** Tests whether the benchmark examples run with success */
 object BenchmarksSpec extends ZIOSpecDefault {
-  override def spec: ZSpec[TestEnvironment, Any] =
+  override def spec: Spec[TestEnvironment, Any] =
     suite("Benchmarks")(
       suite("basic")(
         testParserBenchmark("RepeatAnyChar", new RepeatAnyChar),
@@ -45,7 +45,7 @@ object BenchmarksSpec extends ZIOSpecDefault {
   private def testParserBenchmark[T](
       name: String,
       create: => ParserBenchmark[T]
-  ): Spec[Any, TestFailure[Nothing], TestSuccess] = {
+  ): Spec[Any, Nothing] = {
     val benchmark = create
     benchmark.setUp()
 

diff --git a/build.sbt b/build.sbt
@@ -42,7 +42,7 @@ addCommandAlias(
   ";zioParserNative/test"
 )
 
-val zioVersion = "2.0.0-RC5"
+val zioVersion = "2.0.0-RC6"
 
 lazy val root = (project in file("."))
   .aggregate(

diff --git a/zio-parser-caliban/src/main/scala/zio/parser/caliban/CalibanParser.scala b/zio-parser-caliban/src/main/scala/zio/parser/caliban/CalibanParser.scala
@@ -795,15 +795,15 @@ object CalibanParser {
     //      case Right(result) =>
     //        IO.succeed(Document(result._2.definitions,sm))
     //    }
-    Task
+    ZIO
       .attempt(document.parseString(query))
       .mapError(ex => ParsingError(s"Internal parsing error", innerThrowable = Some(ex)))
       .flatMap {
         case Left(error)   =>
           // IO.fail(ParsingError(error.toString, Some(sm.getLocation(error.failedAtOffset))))
-          IO.fail(ParsingError(error.toString, None))
+          ZIO.fail(ParsingError(error.toString, None))
         case Right(result) =>
-          IO.succeed(Document(result.definitions, sm))
+          ZIO.succeed(Document(result.definitions, sm))
       }
   }
 
@@ -896,13 +896,13 @@ object CalibanDemo extends ZIOAppDefault {
 """.trim
 
   val parsed: ZIO[Any, Nothing, Either[Parser.ParserError[String], StringValue]] =
-    UIO
+    ZIO
       .succeed(CalibanParser.stringValue.parseString(query))
       //  val parsed = UIO(CalibanSyntax.stringValue.parse("\"\"\"hello\"\"\""))
       .tap {
-        case Left(_)      => UIO.unit
+        case Left(_)      => ZIO.unit
         case Right(value) =>
-          UIO.succeed(value.getClass).debug("CLASS")
+          ZIO.succeed(value.getClass).debug("CLASS")
       }
 
 //  Debug.printParserTree(CalibanParser.document.asParser.optimized)