Merge pull request #970 from typelevel/update/scala-library-2.13.13

Update scala-library to 2.13.13
typelevel · Apr 1, 2024 · 41b7e23 · 41b7e23
2 parents e313e18 + 5fd2ba9
commit 41b7e23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -273,7 +273,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.12]
+        scala: [2.13.13]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ import com.typesafe.tools.mima.core._
 ThisBuild / tlBaseVersion := "0.3"
 
 val scala212Version = "2.12.19"
-val scala213Version = "2.13.12"
+val scala213Version = "2.13.13"
 val scala30Version = "3.3.3"
 
 val collectionCompatVersion = "2.11.0"

diff --git a/modules/core/shared/src/main/scala/Trace.scala b/modules/core/shared/src/main/scala/Trace.scala
@@ -93,7 +93,7 @@ object Trace {
               local.get.flatMap { old =>
                 local
                   .set(child)
-                  .bracket(_ => fa.onError(child.attachError(_)))(_ => local.set(old))
+                  .bracket(_ => fa.onError { case e => child.attachError(e) })(_ => local.set(old))
               }
 
           }
@@ -224,7 +224,7 @@ object Trace {
                     new (Kleisli[F, E, *] ~> Kleisli[F, E, *]) {
                       def apply[A](fa: Kleisli[F, E, A]): Kleisli[F, E, A] =
                         fa.local((_: E) => g(e, child))
-                          .mapF(_.onError { case e => child.attachError(e) })
+                          .mapF(_.onError { case err => child.attachError(err) })
                     } -> release.andThen(Kleisli.liftF[F, E, Unit](_))
                 }
               )

diff --git a/modules/xray/src/test/scala/XRaySuite.scala b/modules/xray/src/test/scala/XRaySuite.scala
@@ -40,14 +40,14 @@ class XRaySuite extends ScalaCheckSuite {
     assertEquals(
       XRaySpan.parseHeader(noParent),
       Some(
-        XRaySpan.XRayHeader(rootId, None, true)
+        XRaySpan.XRayHeader(rootId, None, sampled = true)
       )
     )
 
     assertEquals(
       XRaySpan.parseHeader(parent),
       Some(
-        XRaySpan.XRayHeader(rootId, Some(parentId), true)
+        XRaySpan.XRayHeader(rootId, Some(parentId), sampled = true)
       )
     )
 
@@ -56,9 +56,9 @@ class XRaySuite extends ScalaCheckSuite {
 
   test("header encoding") {
 
-    assertEquals(XRaySpan.encodeHeader(rootId, None, true), noParent)
-    assertEquals(XRaySpan.encodeHeader(rootId, Some(parentId), true), parent)
-    assertEquals(XRaySpan.encodeHeader(rootId, None, false), notSampled)
+    assertEquals(XRaySpan.encodeHeader(rootId, None, sampled = true), noParent)
+    assertEquals(XRaySpan.encodeHeader(rootId, Some(parentId), sampled = true), parent)
+    assertEquals(XRaySpan.encodeHeader(rootId, None, sampled = false), notSampled)
   }
 
   property("header encoding/parsing round-trip") {