Merge branch 'main' into update/sbt-1.10.0

typelevel · May 12, 2024 · c44e467 · c44e467
2 parents 97d58b7 + 4f40902
commit c44e467
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 14 deletions.
diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,7 @@ ThisBuild / organization := "co.fs2"
 ThisBuild / organizationName := "Functional Streams for Scala"
 ThisBuild / startYear := Some(2013)
 
-val Scala213 = "2.13.12"
+val Scala213 = "2.13.14"
 
 ThisBuild / scalaVersion := Scala213
 ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.3")

diff --git a/core/shared/src/main/scala/fs2/Chunk.scala b/core/shared/src/main/scala/fs2/Chunk.scala
@@ -1511,8 +1511,8 @@ object Chunk
                 case Right(b) =>
                   buf += b
                   go()
-                case Left(a) =>
-                  state = (f(a).iterator) :: h :: tail
+                case Left(a2) =>
+                  state = (f(a2).iterator) :: h :: tail
                   go()
               }
           }

diff --git a/core/shared/src/main/scala/fs2/Pull.scala b/core/shared/src/main/scala/fs2/Pull.scala
@@ -375,7 +375,6 @@ object Pull extends PullLowPriority {
     * The `F` type must be explicitly provided (e.g., via `raiseError[IO]`
     * or `raiseError[Fallible]`).
     */
-  @nowarn("msg=never used")
   def raiseError[F[_]: RaiseThrowable](err: Throwable): Pull[F, Nothing, Nothing] = Fail(err)
 
   /** Creates a pull that evaluates the supplied effect `fr`, emits no
@@ -1192,8 +1191,8 @@ object Pull extends PullLowPriority {
               else
                 // interrupts scope was already interrupted, resume operation
                 err1 match {
-                  case None      => unit
-                  case Some(err) => Fail(err)
+                  case None     => unit
+                  case Some(e2) => Fail(e2)
                 }
           }
 

diff --git a/core/shared/src/main/scala/fs2/text.scala b/core/shared/src/main/scala/fs2/text.scala
@@ -22,7 +22,6 @@
 package fs2
 
 import cats.ApplicativeThrow
-import cats.syntax.foldable._
 import java.nio.{Buffer, ByteBuffer, CharBuffer}
 import java.nio.charset.{
   CharacterCodingException,

diff --git a/core/shared/src/test/scala-2.13/fs2/ChunkPlatformSuite.scala b/core/shared/src/test/scala-2.13/fs2/ChunkPlatformSuite.scala
@@ -21,7 +21,6 @@
 
 package fs2
 
-import scala.annotation.nowarn
 import scala.collection.immutable.ArraySeq
 import scala.collection.{immutable, mutable}
 import scala.reflect.ClassTag
@@ -31,7 +30,6 @@ import Arbitrary.arbitrary
 
 class ChunkPlatformSuite extends Fs2Suite {
 
-  @nowarn("cat=unused-params")
   private implicit def genArraySeq[A: Arbitrary: ClassTag]: Arbitrary[ArraySeq[A]] =
     Arbitrary(Gen.listOf(arbitrary[A]).map(ArraySeq.from))
   private implicit def genMutableArraySeq[A: Arbitrary: ClassTag]: Arbitrary[mutable.ArraySeq[A]] =

diff --git a/core/shared/src/test/scala/fs2/StreamMergeSuite.scala b/core/shared/src/test/scala/fs2/StreamMergeSuite.scala
@@ -25,7 +25,6 @@ import scala.concurrent.duration._
 
 import cats.effect.IO
 import cats.effect.kernel.{Deferred, Ref}
-import cats.syntax.all._
 import org.scalacheck.effect.PropF.forAllF
 
 class StreamMergeSuite extends Fs2Suite {

diff --git a/integration/src/test/scala/fs2/MemoryLeakSpec.scala b/integration/src/test/scala/fs2/MemoryLeakSpec.scala
@@ -29,7 +29,6 @@ import java.nio.file.{Files, Path}
 import cats.~>
 import cats.effect.IO
 import cats.effect.unsafe.implicits.global
-import cats.syntax.all._
 import org.typelevel.scalaccompat.annotation._
 
 import munit.{FunSuite, TestOptions}

diff --git a/io/js/src/test/scala/fs2/io/net/udp/UdpSuitePlatform.scala b/io/js/src/test/scala/fs2/io/net/udp/UdpSuitePlatform.scala
@@ -24,8 +24,6 @@ package io
 package net
 package udp
 
-import cats.syntax.all._
-
 import fs2.io.internal.facade
 
 trait UdpSuitePlatform extends Fs2Suite {

diff --git a/io/jvm/src/test/scala/fs2/io/file/WalkBenchmark.scala b/io/jvm/src/test/scala/fs2/io/file/WalkBenchmark.scala
@@ -83,7 +83,10 @@ class WalkBenchmark extends Fs2IoSuite {
         .unsafeRunSync()
     )
     val nioTime = time(java.nio.file.Files.walk(target.toNioPath).count())
-    val epsilon = nioTime.toNanos * 1.5
+    val isOSX = sys.props("os.name") == "Mac OS X"
+    val factor = if (isOSX) 4.0 else 1.5 // OS X GHA workers tend to fail this test at 1.5x
+    val epsilon = nioTime.toNanos * factor
+    println(s"limit: ${epsilon.nanos.toMillis} ms")
     println(s"fs2 took: ${fs2Time.toMillis} ms")
     println(s"fs2 eager took: ${fs2EagerTime.toMillis} ms")
     println(s"nio took: ${nioTime.toMillis} ms")