Merge branch 'main' into scala3-style-imports

Author: satorg

.git-blame-ignore-revs

@@ -15,3 +15,6 @@ f025b0198d55d7f5c09ee976eec9e274d8dd0309
 
 # Scala Steward: Reformat with scalafmt 3.5.9
 b4d207e9fa9f1463f0827fe20101e7901fecf820
+
+# Scala Steward: Reformat with scalafmt 3.8.4
+42490f49d2a62289c8ca0a57357f323982eeb93b

.github/workflows/ci.yml

@@ -24,10 +24,10 @@ concurrency:
 
 jobs:
   build:
-    name: Build and Test
+    name: Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         scala: [2.12, 2.13, 3]
         java: [temurin@8, temurin@17, graalvm@21]
         project: [catsNative, catsJS, catsJVM]
@@ -51,14 +51,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -102,7 +102,7 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: nativeLink
@@ -117,11 +117,11 @@ jobs:
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
 
       - name: Make target directories
@@ -145,18 +145,18 @@ jobs:
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -315,18 +315,18 @@ jobs:
     if: github.event.repository.fork == false && github.event_name != 'pull_request'
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -376,7 +376,7 @@ jobs:
     name: Validate Steward Config
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -401,18 +401,18 @@ jobs:
     name: Generate Site
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -467,18 +467,18 @@ jobs:
     name: Scalafix
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.8.2
+version=3.8.6
 align.openParenCallSite = true
 align.openParenDefnSite = true
 maxColumn = 120

alleycats-core/src/main/scala/alleycats/syntax/all.scala

@@ -21,4 +21,4 @@
 
 package alleycats.syntax
 
-object all extends EmptySyntax with FoldableSyntax
+object all extends EmptySyntax with FoldableSyntax with ExtractSyntax

alleycats-core/src/main/scala/alleycats/syntax/extract.scala

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015 Typelevel
+ *
+ * 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 alleycats
+package syntax
+
+import alleycats.Extract
+
+object extract extends ExtractSyntax
+
+trait ExtractSyntax {
+  implicit final def catsSyntaxExtract[F[_], A](fa: F[A]): ExtractOps[F, A] = new ExtractOps[F, A](fa)
+}
+
+final private[alleycats] class ExtractOps[F[_], A](private val fa: F[A]) extends AnyVal {
+  def extract(implicit F: Extract[F]): A = F.extract(fa)
+}

alleycats-core/src/test/scala/alleycats/SyntaxSuite.scala

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2015 Typelevel
+ *
+ * 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 alleycats
+
+import cats.{Eq, Foldable}
+import alleycats.syntax.all.{catsSyntaxExtract, EmptyOps, ExtraFoldableOps}
+
+/**
+ * Test that our syntax implicits are working.
+ *
+ * Each method should correspond to one type class worth of syntax.
+ * Ideally, we should be testing every operator or method that we
+ * expect to add to generic parameters. This file is a safeguard
+ * against accidentally breaking (or removing) syntax which was
+ * otherwise untested.
+ *
+ * The strategy here is to create "mock" values of particular types,
+ * and then ensure that the syntax we want is available. We never plan
+ * to run any of these methods, so we don't need real values. All
+ * values in the methods should be generic -- we rely on parametricity
+ * to guarantee that the syntax will be available for any type with
+ * the proper type class instance(s).
+ *
+ * None of these tests should ever run, or do any runtime checks.
+ */
+object SyntaxSuite {
+
+  // pretend we have a value of type A
+  def mock[A]: A = ???
+
+  def testEmpty[A: Empty]: Unit = {
+    val x = mock[A]
+    implicit val y: Eq[A] = mock[Eq[A]]
+    val a0: Boolean = x.isEmpty
+    val a1: Boolean = x.nonEmpty
+  }
+
+  def testFoldable[F[_]: Foldable, A]: Unit = {
+    val x = mock[F[A]]
+    val y = mock[A => Unit]
+    x.foreach(y)
+  }
+
+  def testExtract[F[_]: Extract, A]: Unit = {
+    val x = mock[F[A]]
+    val y = x.extract
+  }
+}

build.sbt

@@ -1,12 +1,12 @@
-ThisBuild / tlBaseVersion := "2.12"
+ThisBuild / tlBaseVersion := "2.13"
 
 val scalaCheckVersion = "1.18.1"
 
 val disciplineVersion = "1.7.0"
 
 val disciplineMunitVersion = "2.0.0"
 
-val munitVersion = "1.0.3"
+val munitVersion = "1.1.0"
 
 val PrimaryJava = JavaSpec.temurin("8")
 val LTSJava = JavaSpec.temurin("17")
@@ -15,7 +15,7 @@ val GraalVM = JavaSpec.graalvm("21")
 ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, GraalVM)
 
 val Scala212 = "2.12.20"
-val Scala213 = "2.13.15"
+val Scala213 = "2.13.16"
 val Scala3 = "3.3.4"
 
 ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3)

core/src/main/scala-2.12/cats/data/ChainCompanionCompat.scala

@@ -38,15 +38,17 @@ private[data] trait ChainCompanionCompat {
     }
 
   private def fromImmutableSeq[A](s: immutable.Seq[A]): Chain[A] = {
-    if (s.isEmpty) nil
-    else if (s.lengthCompare(1) == 0) one(s.head)
-    else Wrap(s)
+    val lc = s.lengthCompare(1)
+    if (lc < 0) nil
+    else if (lc > 0) Wrap(s)
+    else one(s.head)
   }
 
   private def fromMutableSeq[A](s: Seq[A]): Chain[A] = {
-    if (s.isEmpty) nil
-    else if (s.lengthCompare(1) == 0) one(s.head)
-    else Wrap(s.toVector)
+    val lc = s.lengthCompare(1)
+    if (lc < 0) nil
+    else if (lc > 0) Wrap(s.toVector)
+    else one(s.head)
   }
 
   /**

core/src/main/scala-2.13+/cats/data/ChainCompanionCompat.scala

@@ -28,10 +28,12 @@ private[data] trait ChainCompanionCompat {
   /**
    * Creates a Chain from the specified sequence.
    */
-  def fromSeq[A](s: Seq[A]): Chain[A] =
-    if (s.isEmpty) nil
-    else if (s.lengthCompare(1) == 0) one(s.head)
-    else Wrap(s)
+  def fromSeq[A](s: Seq[A]): Chain[A] = {
+    val lc = s.lengthCompare(1)
+    if (lc < 0) nil
+    else if (lc > 0) Wrap(s)
+    else one(s.head)
+  }
 
   /**
    * Creates a Chain from the specified IterableOnce.