rewrite

build.sbt

@@ -143,6 +143,7 @@ lazy val commonSettings =
         // (We need "-source:future" for for comprehension irrefutable pattern on Scala 3)
         // compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
       ).filterNot(_ => tlIsScala3.value),
+//      scalacOptions ++= Seq("-rewrite", "-source:future-migration").filter(_ => tlIsScala3.value),
 
       // MUnit
       libraryDependencies ++= Seq(

modules/bench/src/main/scala/doobie/bench/select.scala

@@ -5,9 +5,9 @@
 package doobie.bench
 
 import cats.effect.IO
-import doobie._, doobie.implicits._
+import doobie.*, doobie.implicits.*
 import java.sql.DriverManager
-import org.openjdk.jmh.annotations._
+import org.openjdk.jmh.annotations.*
 
 object shared {
 
@@ -21,7 +21,7 @@ object shared {
 }
 
 class bench {
-  import shared._
+  import shared.*
   import cats.effect.unsafe.implicits.global
 
   // Baseline hand-written JDBC code

modules/bench/src/main/scala/doobie/bench/text.scala

@@ -4,17 +4,17 @@
 
 package doobie.bench
 
-import cats.syntax.all._
-import doobie._
-import doobie.implicits._
-import doobie.postgres.implicits._
-import fs2._
-import org.openjdk.jmh.annotations._
+import cats.syntax.all.*
+import doobie.*
+import doobie.implicits.*
+import doobie.postgres.implicits.*
+import fs2.*
+import org.openjdk.jmh.annotations.*
 
 final case class Person(name: String, age: Int)
 
 class text {
-  import shared._
+  import shared.*
   import cats.effect.unsafe.implicits.global
 
   def people(n: Int): List[Person] =

modules/core/src/main/scala-2.13+/doobie/util/compat/package.scala

@@ -4,10 +4,10 @@
 
 package doobie.util
 
-import java.{util => ju}
+import java.{util as ju}
 import scala.collection.mutable
 import scala.collection.immutable.Map
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 
 package object compat {
   type =:=[From, To] = scala.=:=[From, To]

modules/core/src/main/scala-3/util/ReadPlatform.scala

@@ -33,7 +33,7 @@ trait ReadPlatform:
 
   // Derivation base case for product types (1-element)
   given productBase[H](
-      using H: Read[H] OrElse MkRead[H]
+      using H: Read[H] `OrElse` MkRead[H]
   ): MkRead[H *: EmptyTuple] = {
     val head = H.unify
     new MkRead(
@@ -45,7 +45,7 @@ trait ReadPlatform:
   // Read for head and tail.
   given product[H, T <: Tuple](
       using
-      H: Read[H] OrElse MkRead[H],
+      H: Read[H] `OrElse` MkRead[H],
       T: MkRead[T]
   ): MkRead[H *: T] = {
     val head = H.unify
@@ -57,7 +57,7 @@ trait ReadPlatform:
   }
 
   given optProductBase[H](
-      using H: Read[Option[H]] OrElse MkRead[Option[H]]
+      using H: Read[Option[H]] `OrElse` MkRead[Option[H]]
   ): MkRead[Option[H *: EmptyTuple]] = {
     val head = H.unify
     MkRead[Option[H *: EmptyTuple]](
@@ -68,7 +68,7 @@ trait ReadPlatform:
 
   given optProduct[H, T <: Tuple](
       using
-      H: Read[Option[H]] OrElse MkRead[Option[H]],
+      H: Read[Option[H]] `OrElse` MkRead[Option[H]],
       T: MkRead[Option[T]]
   ): MkRead[Option[H *: T]] = {
     val head = H.unify
@@ -84,7 +84,7 @@ trait ReadPlatform:
   }
 
   given optProductOptBase[H](
-      using H: Read[Option[H]] OrElse MkRead[Option[H]]
+      using H: Read[Option[H]] `OrElse` MkRead[Option[H]]
   ): MkRead[Option[Option[H] *: EmptyTuple]] = {
     val head = H.unify
 
@@ -96,7 +96,7 @@ trait ReadPlatform:
 
   given optProductOpt[H, T <: Tuple](
       using
-      H: Read[Option[H]] OrElse MkRead[Option[H]],
+      H: Read[Option[H]] `OrElse` MkRead[Option[H]],
       T: MkRead[Option[T]]
   ): MkRead[Option[Option[H] *: T]] = {
     val head = H.unify

modules/core/src/main/scala-3/util/WritePlatform.scala

@@ -33,7 +33,7 @@ trait WritePlatform:
 
   // Derivation base case for product types (1-element)
   given productBase[H](
-      using H: Write[H] OrElse MkWrite[H]
+      using H: Write[H] `OrElse` MkWrite[H]
   ): MkWrite[H *: EmptyTuple] = {
     val head = H.unify
     MkWrite(
@@ -47,7 +47,7 @@ trait WritePlatform:
   // Derivation inductive case for product types
   given product[H, T <: Tuple](
       using
-      H: Write[H] OrElse MkWrite[H],
+      H: Write[H] `OrElse` MkWrite[H],
       T: MkWrite[T]
   ): MkWrite[H *: T] = {
     val head = H.unify
@@ -62,7 +62,7 @@ trait WritePlatform:
 
   // Derivation base case for Option of product types (1-element)
   given optProductBase[H](
-      using H: Write[Option[H]] OrElse MkWrite[Option[H]]
+      using H: Write[Option[H]] `OrElse` MkWrite[Option[H]]
   ): MkWrite[Option[H *: EmptyTuple]] = {
     val head = H.unify
 
@@ -77,7 +77,7 @@ trait WritePlatform:
   // Write[Option[H]], Write[Option[T]] implies Write[Option[H *: T]]
   given optProduct[H, T <: Tuple](
       using
-      H: Write[Option[H]] OrElse MkWrite[Option[H]],
+      H: Write[Option[H]] `OrElse` MkWrite[Option[H]],
       T: MkWrite[Option[T]]
   ): MkWrite[Option[H *: T]] =
     val head = H.unify
@@ -100,7 +100,7 @@ trait WritePlatform:
 
   // Derivation base case for Option of product types (where the head element is Option)
   given optProductOptBase[H](
-      using H: Write[Option[H]] OrElse MkWrite[Option[H]]
+      using H: Write[Option[H]] `OrElse` MkWrite[Option[H]]
   ): MkWrite[Option[Option[H] *: EmptyTuple]] = {
     val head = H.unify
 
@@ -115,7 +115,7 @@ trait WritePlatform:
   // Write[Option[H]], Write[Option[T]] implies Write[Option[Option[H] *: T]]
   given optProductOpt[H, T <: Tuple](
       using
-      H: Write[Option[H]] OrElse MkWrite[Option[H]],
+      H: Write[Option[H]] `OrElse` MkWrite[Option[H]],
       T: MkWrite[Option[T]]
   ): MkWrite[Option[Option[H] *: T]] =
     val head = H.unify

modules/core/src/main/scala-3/util/shapeless/OrElse.scala

@@ -42,9 +42,9 @@ final class Secondary[+B](value: => B) extends OrElse[Nothing, B] {
 }
 
 object OrElse extends OrElse0 {
-  implicit def primary[A, B](implicit a: A): A OrElse B = new Primary(a)
+  implicit def primary[A, B](implicit a: A): A `OrElse` B = new Primary(a)
 }
 
 private[shapeless] abstract class OrElse0 {
-  implicit def secondary[A, B](implicit b: => B): A OrElse B = new Secondary(b)
+  implicit def secondary[A, B](implicit b: => B): A `OrElse` B = new Secondary(b)
 }

modules/core/src/main/scala/doobie/enumerated/autogeneratedkeys.scala

@@ -4,10 +4,10 @@
 
 package doobie.enumerated
 
-import java.sql.Statement._
+import java.sql.Statement.*
 
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class AutoGeneratedKeys(val toInt: Int) extends Product with Serializable

modules/core/src/main/scala/doobie/enumerated/columnnullable.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.ResultSetMetaData._
+import java.sql.ResultSetMetaData.*
 
 import cats.ApplicativeError
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class ColumnNullable(val toInt: Int) extends Product with Serializable {

modules/core/src/main/scala/doobie/enumerated/fetchdirection.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.ResultSet._
+import java.sql.ResultSet.*
 
 import cats.ApplicativeError
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class FetchDirection(val toInt: Int) extends Product with Serializable

modules/core/src/main/scala/doobie/enumerated/holdability.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.ResultSet._
+import java.sql.ResultSet.*
 
 import cats.ApplicativeError
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class Holdability(val toInt: Int) extends Product with Serializable

modules/core/src/main/scala/doobie/enumerated/jdbctype.scala

@@ -4,11 +4,11 @@
 
 package doobie.enumerated
 
-import java.sql.Types._
+import java.sql.Types.*
 
 import cats.Show
 import cats.kernel.Order
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class JdbcType(val toInt: Int) extends Product with Serializable

modules/core/src/main/scala/doobie/enumerated/parametermode.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.ParameterMetaData._
+import java.sql.ParameterMetaData.*
 
 import cats.ApplicativeError
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class ParameterMode(val toInt: Int) extends Product with Serializable

modules/core/src/main/scala/doobie/enumerated/parameternullable.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.ParameterMetaData._
+import java.sql.ParameterMetaData.*
 
 import cats.ApplicativeError
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class ParameterNullable(val toInt: Int) extends Product with Serializable {

modules/core/src/main/scala/doobie/enumerated/resultsetconcurrency.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.ResultSet._
+import java.sql.ResultSet.*
 
 import cats.ApplicativeError
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class ResultSetConcurrency(val toInt: Int) extends Product with Serializable

modules/core/src/main/scala/doobie/enumerated/resultsettype.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.ResultSet._
+import java.sql.ResultSet.*
 
 import cats.ApplicativeError
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class ResultSetType(val toInt: Int) extends Product with Serializable

modules/core/src/main/scala/doobie/enumerated/transactionisolation.scala

@@ -4,13 +4,13 @@
 
 package doobie.enumerated
 
-import doobie.util.invariant._
+import doobie.util.invariant.*
 
-import java.sql.Connection._
+import java.sql.Connection.*
 
 import cats.{ApplicativeError, Show}
 import cats.kernel.Eq
-import cats.kernel.instances.int._
+import cats.kernel.instances.int.*
 
 /** @group Types */
 sealed abstract class TransactionIsolation(val toInt: Int) extends Product with Serializable