Merge remote-tracking branch 'origin/main' into rethrow

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.1.1"
+version = "3.2.0"
 
 style = default
 

benchmark/src/main/scala/fs2/benchmark/ChunkBenchmark.scala

@@ -24,47 +24,26 @@ package benchmark
 
 import org.openjdk.jmh.annotations.{Benchmark, Param, Scope, Setup, State}
 
-import cats.syntax.all._
-
 @State(Scope.Thread)
 class ChunkBenchmark {
   @Param(Array("16", "256", "4096"))
   var chunkSize: Int = _
 
-  @Param(Array("1", "20", "50", "100"))
-  var chunkCount: Int = _
-
-  case class Obj(dummy: Boolean)
-  object Obj {
-    def create: Obj = Obj(true)
-  }
-
-  var chunkSeq: Seq[Chunk[Obj]] = _
-  var flattened: Chunk[Obj] = _
-  var sizeHint: Int = _
+  var ints: Chunk[Int] = _
 
   @Setup
-  def setup() = {
-    chunkSeq = Seq.range(0, chunkCount).map(_ => Chunk.seq(Seq.fill(chunkSize)(Obj.create)))
-    sizeHint = chunkSeq.foldLeft(0)(_ + _.size)
-    flattened = Chunk.seq(chunkSeq).flatten
-  }
+  def setup() =
+    ints = Chunk.seq((0 until chunkSize).map(_ + 1000)).compact
 
   @Benchmark
-  def concat(): Unit = {
-    Chunk.concat(chunkSeq, sizeHint)
+  def map(): Unit = {
+    ints.map(_ + 1)
     ()
   }
 
   @Benchmark
-  def traverse(): Boolean = {
-    val fn: () => Chunk[Boolean] =
-      flattened.traverse { obj =>
-        if (obj.dummy) { () => true }
-        else { () => false }
-      }
-
-    fn().isEmpty
+  def filter(): Unit = {
+    ints.filter(_ % 3 == 0)
+    ()
   }
-
 }

benchmark/src/main/scala/fs2/benchmark/ChunksBenchmark.scala

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2013 Functional Streams for Scala
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package fs2
+package benchmark
+
+import org.openjdk.jmh.annotations.{Benchmark, Param, Scope, Setup, State}
+
+import cats.syntax.all._
+
+@State(Scope.Thread)
+class ChunksBenchmark {
+  @Param(Array("16", "256", "4096"))
+  var chunkSize: Int = _
+
+  @Param(Array("1", "20", "50", "100"))
+  var chunkCount: Int = _
+
+  case class Obj(dummy: Boolean)
+  object Obj {
+    def create: Obj = Obj(true)
+  }
+
+  var chunkSeq: Seq[Chunk[Obj]] = _
+  var flattened: Chunk[Obj] = _
+  var sizeHint: Int = _
+
+  @Setup
+  def setup() = {
+    chunkSeq = Seq.range(0, chunkCount).map(_ => Chunk.seq(Seq.fill(chunkSize)(Obj.create)))
+    sizeHint = chunkSeq.foldLeft(0)(_ + _.size)
+    flattened = Chunk.seq(chunkSeq).flatten
+  }
+
+  @Benchmark
+  def concat(): Unit = {
+    Chunk.concat(chunkSeq, sizeHint)
+    ()
+  }
+
+  @Benchmark
+  def traverse(): Boolean = {
+    val fn: () => Chunk[Boolean] =
+      flattened.traverse { obj =>
+        if (obj.dummy) { () => true }
+        else { () => false }
+      }
+
+    fn().isEmpty
+  }
+}

build.sbt

@@ -205,11 +205,11 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
   .settings(
     name := "fs2-core",
     libraryDependencies ++= Seq(
-      "org.typelevel" %%% "cats-core" % "2.6.1",
-      "org.typelevel" %%% "cats-laws" % "2.6.1" % Test,
-      "org.typelevel" %%% "cats-effect" % "3.2.9",
-      "org.typelevel" %%% "cats-effect-laws" % "3.2.9" % Test,
-      "org.typelevel" %%% "cats-effect-testkit" % "3.2.9" % Test,
+      "org.typelevel" %%% "cats-core" % "2.7.0",
+      "org.typelevel" %%% "cats-laws" % "2.7.0" % Test,
+      "org.typelevel" %%% "cats-effect" % "3.3.0",
+      "org.typelevel" %%% "cats-effect-laws" % "3.3.0" % Test,
+      "org.typelevel" %%% "cats-effect-testkit" % "3.3.0" % Test,
       "org.scodec" %%% "scodec-bits" % "1.1.29",
       "org.typelevel" %%% "scalacheck-effect-munit" % "1.0.3" % Test,
       "org.typelevel" %%% "munit-cats-effect-3" % "1.0.6" % Test,
@@ -236,17 +236,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
   )
 
 lazy val coreJVM = core.jvm
-  .enablePlugins(SbtOsgi)
   .settings(
-    Test / fork := true,
-    OsgiKeys.exportPackage := Seq("fs2.*"),
-    OsgiKeys.privatePackage := Seq(),
-    OsgiKeys.importPackage := {
-      val Some((major, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-      Seq(s"""scala.*;version="[$major.$minor,$major.${minor + 1})"""", "*")
-    },
-    OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
-    osgiSettings
+    Test / fork := true
   )
 
 lazy val coreJS = core.js
@@ -278,7 +269,6 @@ lazy val node = crossProject(JSPlatform)
 
 lazy val io = crossProject(JVMPlatform, JSPlatform)
   .in(file("io"))
-  .jvmEnablePlugins(SbtOsgi)
   .jsEnablePlugins(ScalaJSBundlerPlugin)
   .settings(
     name := "fs2-io",
@@ -287,21 +277,9 @@ lazy val io = crossProject(JVMPlatform, JSPlatform)
   .jvmSettings(
     Test / fork := true,
     libraryDependencies ++= Seq(
-      "com.github.jnr" % "jnr-unixsocket" % "0.38.12" % Optional,
+      "com.github.jnr" % "jnr-unixsocket" % "0.38.13" % Optional,
       "com.google.jimfs" % "jimfs" % "1.2" % Test
-    ),
-    OsgiKeys.exportPackage := Seq("fs2.io.*"),
-    OsgiKeys.privatePackage := Seq(),
-    OsgiKeys.importPackage := {
-      val Some((major, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-      Seq(
-        s"""scala.*;version="[$major.$minor,$major.${minor + 1})"""",
-        """fs2.*;version="${Bundle-Version}"""",
-        "*"
-      )
-    },
-    OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
-    osgiSettings
+    )
   )
   .jsSettings(
     scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)),
@@ -314,26 +292,13 @@ lazy val io = crossProject(JVMPlatform, JSPlatform)
 
 lazy val scodec = crossProject(JVMPlatform, JSPlatform)
   .in(file("scodec"))
-  .enablePlugins(SbtOsgi)
   .settings(
     name := "fs2-scodec",
     libraryDependencies += "org.scodec" %%% "scodec-core" % (if (
                                                                scalaVersion.value.startsWith("2.")
                                                              )
                                                                "1.11.9"
                                                              else "2.1.0"),
-    OsgiKeys.exportPackage := Seq("fs2.interop.scodec.*"),
-    OsgiKeys.privatePackage := Seq(),
-    OsgiKeys.importPackage := {
-      val Some((major, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-      Seq(
-        s"""scala.*;version="[$major.$minor,$major.${minor + 1})"""",
-        """fs2.*;version="${Bundle-Version}"""",
-        "*"
-      )
-    },
-    OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
-    osgiSettings,
     mimaPreviousArtifacts := mimaPreviousArtifacts.value.filter { v =>
       VersionNumber(v.revision).matchesSemVer(SemanticSelector(">3.2.0"))
     }
@@ -345,21 +310,8 @@ lazy val scodec = crossProject(JVMPlatform, JSPlatform)
 
 lazy val protocols = crossProject(JVMPlatform, JSPlatform)
   .in(file("protocols"))
-  .enablePlugins(SbtOsgi)
   .settings(
     name := "fs2-protocols",
-    OsgiKeys.exportPackage := Seq("fs2.protocols.*"),
-    OsgiKeys.privatePackage := Seq(),
-    OsgiKeys.importPackage := {
-      val Some((major, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-      Seq(
-        s"""scala.*;version="[$major.$minor,$major.${minor + 1})"""",
-        """fs2.*;version="${Bundle-Version}"""",
-        "*"
-      )
-    },
-    OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
-    osgiSettings,
     mimaPreviousArtifacts := mimaPreviousArtifacts.value.filter { v =>
       VersionNumber(v.revision).matchesSemVer(SemanticSelector(">3.2.0"))
     }
@@ -371,27 +323,14 @@ lazy val protocols = crossProject(JVMPlatform, JSPlatform)
 
 lazy val reactiveStreams = project
   .in(file("reactive-streams"))
-  .enablePlugins(SbtOsgi)
   .settings(
     name := "fs2-reactive-streams",
     Test / fork := true,
     libraryDependencies ++= Seq(
       "org.reactivestreams" % "reactive-streams" % "1.0.3",
       "org.reactivestreams" % "reactive-streams-tck" % "1.0.3" % "test",
       ("org.scalatestplus" %% "testng-6-7" % "3.2.10.0" % "test").cross(CrossVersion.for3Use2_13)
-    ),
-    OsgiKeys.exportPackage := Seq("fs2.interop.reactivestreams.*"),
-    OsgiKeys.privatePackage := Seq(),
-    OsgiKeys.importPackage := {
-      val Some((major, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-      Seq(
-        s"""scala.*;version="[$major.$minor,$major.${minor + 1})"""",
-        """fs2.*;version="${Bundle-Version}"""",
-        "*"
-      )
-    },
-    OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
-    osgiSettings
+    )
   )
   .dependsOn(coreJVM % "compile->compile;test->test")
 

core/shared/src/main/scala-2.12/fs2/ChunkPlatform.scala

@@ -21,7 +21,7 @@
 
 package fs2
 
-import scala.collection.mutable.WrappedArray
+import scala.collection.mutable.{ArrayBuilder, WrappedArray}
 import scala.reflect.ClassTag
 
 private[fs2] trait ChunkPlatform[+O] { self: Chunk[O] => }
@@ -34,6 +34,9 @@ private[fs2] trait ChunkCompanionPlatform { self: Chunk.type =>
       case _                  => None
     }
 
+  private[fs2] def makeArrayBuilder[A](implicit ct: ClassTag[A]): ArrayBuilder[A] =
+    ArrayBuilder.make()(ct)
+
   /** Creates a chunk backed by a `WrappedArray`
     */
   def wrappedArray[O](wrappedArray: WrappedArray[O]): Chunk[O] = {

core/shared/src/main/scala-2.13/fs2/ChunkPlatform.scala

@@ -23,6 +23,7 @@ package fs2
 
 import scala.collection.immutable.ArraySeq
 import scala.collection.immutable
+import scala.collection.mutable.ArrayBuilder
 import scala.reflect.ClassTag
 
 private[fs2] trait ChunkPlatform[+O] { self: Chunk[O] =>
@@ -53,10 +54,17 @@ private[fs2] trait ChunkCompanionPlatform { self: Chunk.type =>
       case _                        => None
     }
 
+  private[fs2] def makeArrayBuilder[A](implicit ct: ClassTag[A]): ArrayBuilder[A] =
+    ArrayBuilder.make(ct)
+
   /** Creates a chunk backed by an immutable `ArraySeq`.
     */
   def arraySeq[O](arraySeq: immutable.ArraySeq[O]): Chunk[O] = {
     val arr = arraySeq.unsafeArray.asInstanceOf[Array[O]]
     array(arr)(ClassTag[O](arr.getClass.getComponentType))
   }
+
+  /** Creates a chunk from a `scala.collection.IterableOnce`. */
+  def iterableOnce[O](i: collection.IterableOnce[O]): Chunk[O] =
+    iterator(i.iterator)
 }

core/shared/src/main/scala-3/fs2/ChunkPlatform.scala

@@ -23,6 +23,7 @@ package fs2
 
 import scala.collection.immutable.ArraySeq
 import scala.collection.immutable
+import scala.collection.mutable.ArrayBuilder
 import scala.reflect.ClassTag
 
 private[fs2] trait ChunkPlatform[+O] { self: Chunk[O] =>
@@ -62,6 +63,9 @@ private[fs2] trait ChunkCompanionPlatform { self: Chunk.type =>
       case _                        => None
     }
 
+  private[fs2] def makeArrayBuilder[A](implicit ct: ClassTag[A]): ArrayBuilder[A] =
+    ArrayBuilder.make(ct)
+
   /** Creates a chunk backed by an immutable `ArraySeq`.
     */
   def arraySeq[O](arraySeq: immutable.ArraySeq[O]): Chunk[O] = {
@@ -115,4 +119,8 @@ private[fs2] trait ChunkCompanionPlatform { self: Chunk.type =>
       if (offset == 0 && length == values.length) values
       else super.toIArray[O2]
   }
+
+  /** Creates a chunk from a `scala.collection.IterableOnce`. */
+  def iterableOnce[O](i: collection.IterableOnce[O]): Chunk[O] =
+    iterator(i.iterator)
 }