Merge pull request #2257 from xuwei-k/scalafmt-convertToNewSyntax

jatcwang · web-flow · commit 3ea001d56c5c · 2025-05-12T09:40:01.000+01:00
update scalafmt setting. use new syntax
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -30,3 +30,6 @@ fileOverride {
 project.excludeFilters = [
   "scalafix/*"
 ]
+
+rewrite.scala3.convertToNewSyntax = true
+rewrite.scala3.newSyntax.control = false
diff --git a/build.sbt b/build.sbt
@@ -212,7 +212,7 @@ lazy val free = project
     freeGen2Dir := (Compile / scalaSource).value / "doobie" / "free",
     freeGen2Package := "doobie.free",
     freeGen2Classes := {
-      List[Class[_]](
+      List[Class[?]](
         classOf[java.sql.NClob],
         classOf[java.sql.Blob],
         classOf[java.sql.Clob],
@@ -229,10 +229,10 @@ lazy val free = project
         classOf[java.sql.ResultSet]
       )
     },
-    freeGen2AllImportExcludes := Set[Class[_]](
-      classOf[java.util.Map[_, _]]
+    freeGen2AllImportExcludes := Set[Class[?]](
+      classOf[java.util.Map[?, ?]]
     ),
-    freeGen2KleisliInterpreterImportExcludes := Set[Class[_]](
+    freeGen2KleisliInterpreterImportExcludes := Set[Class[?]](
       classOf[java.sql.DriverPropertyInfo],
       classOf[java.io.Writer],
       classOf[java.io.OutputStream]
@@ -344,7 +344,7 @@ lazy val postgres = project
     freeGen2Dir := (Compile / scalaSource).value / "doobie" / "postgres" / "free",
     freeGen2Package := "doobie.postgres.free",
     freeGen2Classes := {
-      List[Class[_]](
+      List[Class[?]](
         classOf[org.postgresql.copy.CopyIn],
         classOf[org.postgresql.copy.CopyManager],
         classOf[org.postgresql.copy.CopyOut],
@@ -359,10 +359,10 @@ lazy val postgres = project
       classOf[org.postgresql.copy.CopyManager] -> "PGCopyManager",
       classOf[org.postgresql.copy.CopyOut] -> "PGCopyOut"
     ),
-    freeGen2AllImportExcludes := Set[Class[_]](
-      classOf[java.util.Map[_, _]]
+    freeGen2AllImportExcludes := Set[Class[?]](
+      classOf[java.util.Map[?, ?]]
     ),
-    freeGen2KleisliInterpreterImportExcludes := Set[Class[_]](
+    freeGen2KleisliInterpreterImportExcludes := Set[Class[?]](
       classOf[java.sql.Array],
       classOf[org.postgresql.copy.CopyDual]
     ),
diff --git a/modules/core/src/main/scala-2.13+/doobie/util/compat/package.scala b/modules/core/src/main/scala-2.13+/doobie/util/compat/package.scala
@@ -4,7 +4,7 @@
 
 package doobie.util
 
-import java.{util as ju}
+import java.util as ju
 import scala.collection.mutable
 import scala.collection.immutable.Map
 import scala.jdk.CollectionConverters.*
diff --git a/modules/core/src/main/scala-2.13-/doobie/util/compat/package.scala b/modules/core/src/main/scala-2.13-/doobie/util/compat/package.scala
@@ -4,8 +4,8 @@
 
 package doobie.util
 
-import java.{util => ju}
-import scala.collection.JavaConverters._
+import java.util as ju
+import scala.collection.JavaConverters.*
 import scala.collection.mutable
 import scala.collection.immutable.Map
 
diff --git a/modules/core/src/main/scala/doobie/hi/connection.scala b/modules/core/src/main/scala/doobie/hi/connection.scala
@@ -23,7 +23,7 @@ import doobie.util.stream.repeatEvalChunks
 import doobie.util.log.{LogEvent, LoggingInfo}
 import doobie.util.{Get, Put, Read, Write}
 import fs2.Stream
-import doobie.hi.{preparedstatement as IHPS}
+import doobie.hi.preparedstatement as IHPS
 import doobie.free.{
   callablestatement as IFCS,
   connection as IFC,
diff --git a/modules/core/src/main/scala/doobie/hi/resultset.scala b/modules/core/src/main/scala/doobie/hi/resultset.scala
@@ -14,7 +14,7 @@ import doobie.util.{Read, Write}
 import doobie.util.compat.FactoryCompat
 import doobie.util.invariant.*
 import doobie.util.stream.repeatEvalChunks
-import doobie.free.{resultset as IFRS}
+import doobie.free.resultset as IFRS
 
 import fs2.Stream
 
diff --git a/modules/core/src/main/scala/doobie/syntax/applicativeerror.scala b/modules/core/src/main/scala/doobie/syntax/applicativeerror.scala
@@ -5,7 +5,7 @@
 package doobie.syntax
 
 import cats.ApplicativeError
-import doobie.util.{catchsql as C}
+import doobie.util.catchsql as C
 import doobie.enumerated.SqlState
 import java.sql.SQLException
 
diff --git a/modules/core/src/main/scala/doobie/syntax/connectionio.scala b/modules/core/src/main/scala/doobie/syntax/connectionio.scala
@@ -10,7 +10,7 @@ import cats.syntax.functor.*
 import doobie.ConnectionIO
 import doobie.implicits.*
 import doobie.util.transactor.Transactor
-import doobie.hi.{connection as IHC}
+import doobie.hi.connection as IHC
 
 class ConnectionIOOps[A](ma: ConnectionIO[A]) {
   def transact[M[_]: MonadCancelThrow](xa: Transactor[M]): M[A] = xa.trans.apply(ma)
diff --git a/modules/core/src/main/scala/doobie/syntax/foldable.scala b/modules/core/src/main/scala/doobie/syntax/foldable.scala
@@ -5,7 +5,7 @@
 package doobie.syntax
 
 import cats.*
-import doobie.util.{foldable as F}
+import doobie.util.foldable as F
 
 class FoldableOps[F[_]: Foldable, A: Monoid](self: F[A]) {
   def foldSmash1(prefix: A, delim: A, suffix: A): A = F.foldSmash1(self)(prefix, delim, suffix)
diff --git a/modules/core/src/main/scala/doobie/util/transactor.scala b/modules/core/src/main/scala/doobie/util/transactor.scala
@@ -11,7 +11,7 @@ import doobie.implicits.*
 import doobie.util.lens.*
 import doobie.util.log.LogHandler
 import doobie.util.yolo.Yolo
-import doobie.free.{connection as IFC}
+import doobie.free.connection as IFC
 import cats.{Monad, ~>}
 import cats.data.Kleisli
 import cats.effect.kernel.{Async, MonadCancelThrow, Resource}
diff --git a/modules/core/src/test/scala-2/doobie/util/QueryLogSuitePlatform.scala b/modules/core/src/test/scala-2/doobie/util/QueryLogSuitePlatform.scala
@@ -5,7 +5,7 @@
 package doobie.util
 
 import doobie.util.log.{Parameters, ProcessingFailure, Success}
-import shapeless._
+import shapeless.*
 
 trait QueryLogSuitePlatform { self: QueryLogSuite =>
 
diff --git a/modules/core/src/test/scala-2/doobie/util/ReadSuitePlatform.scala b/modules/core/src/test/scala-2/doobie/util/ReadSuitePlatform.scala
@@ -11,7 +11,7 @@ import shapeless.record.*
 import scala.annotation.nowarn
 
 trait ReadSuitePlatform { self: munit.FunSuite =>
-  import doobie.generic.auto._
+  import doobie.generic.auto.*
 
   test("Read should exist for shapeless record types") {
     type DL = (Double, Long) // used below
diff --git a/modules/core/src/test/scala-2/doobie/util/WriteSuitePlatform.scala b/modules/core/src/test/scala-2/doobie/util/WriteSuitePlatform.scala
@@ -4,14 +4,14 @@
 
 package doobie.util
 
-import shapeless._
-import shapeless.record._
+import shapeless.*
+import shapeless.record.*
 import doobie.testutils.VoidExtensions
 
 import scala.annotation.nowarn
 
 trait WriteSuitePlatform { self: munit.FunSuite =>
-  import doobie.generic.auto._
+  import doobie.generic.auto.*
 
   test("Write should exist for shapeless record types") {
     type DL = (Double, Long)
diff --git a/modules/example/src/main/scala-2/example/Orm.scala b/modules/example/src/main/scala-2/example/Orm.scala
@@ -6,12 +6,12 @@ package example
 
 import cats.Show
 import cats.effect.{IO, IOApp, ExitCode}
-import cats.syntax.all._
-import doobie._, doobie.implicits._
+import cats.syntax.all.*
+import doobie.*, doobie.implicits.*
 import fs2.Stream
-import shapeless._
-import shapeless.ops.record._
-import shapeless.ops.hlist._
+import shapeless.*
+import shapeless.ops.record.*
+import shapeless.ops.hlist.*
 
 /** A super-simple ORM for super-simple data types. We assume auto-generated keys, represented externally, and columns
   * map 1:1 with fields and have the same names.
@@ -114,7 +114,7 @@ object Orm extends IOApp {
 
   val prog: ConnectionIO[String] = {
     val dn = Dao[Neighbor]
-    import dn._
+    import dn.*
     for {
       _ <- ddl
       ka <- insert(Neighbor("Alice", 42))
diff --git a/modules/example/src/test/scala-2/example/AnalysisTestScalaTest.scala b/modules/example/src/test/scala-2/example/AnalysisTestScalaTest.scala
@@ -7,7 +7,7 @@ package example
 import cats.effect.IO
 import doobie.scalatest.IOChecker
 import doobie.util.transactor.Transactor
-import org.scalatest._
+import org.scalatest.*
 
 class AnalysisTestScalaTest extends funsuite.AnyFunSuite with matchers.must.Matchers with IOChecker {
 
diff --git a/modules/free/src/main/scala-2/doobie/util/PosPlatform.scala b/modules/free/src/main/scala-2/doobie/util/PosPlatform.scala
@@ -18,7 +18,7 @@ trait PosPlatform {
 object PosPlatform {
 
   class PosMacros(val c: blackbox.Context) {
-    import c.universe._
+    import c.universe.*
     def instance_impl: Tree = {
       val file = c.enclosingPosition.source.path
       val line = c.enclosingPosition.line
diff --git a/modules/h2/src/main/scala/doobie/h2/Metas.scala b/modules/h2/src/main/scala/doobie/h2/Metas.scala
@@ -10,7 +10,7 @@ import java.util.UUID
 
 import scala.Predef.*
 import scala.reflect.ClassTag
-import cats.data.NonEmptyList.{of as NonEmptyListOf}
+import cats.data.NonEmptyList.of as NonEmptyListOf
 import doobie.util.meta.Meta
 
 trait Instances {
diff --git a/modules/postgres/src/main/scala/doobie/postgres/Instances.scala b/modules/postgres/src/main/scala/doobie/postgres/Instances.scala
@@ -16,7 +16,7 @@ import org.postgresql.geometric.*
 
 import scala.reflect.ClassTag
 
-import cats.data.NonEmptyList.{of as NonEmptyListOf}
+import cats.data.NonEmptyList.of as NonEmptyListOf
 import org.tpolecat.typename.*
 
 trait Instances {
diff --git a/modules/postgres/src/main/scala/doobie/postgres/hi/connection.scala b/modules/postgres/src/main/scala/doobie/postgres/hi/connection.scala
@@ -10,8 +10,8 @@ import cats.free.Free
 import org.postgresql.{PGConnection, PGNotification}
 import doobie.*, doobie.implicits.*
 import doobie.postgres.free.{Embeddable, KleisliInterpreter}
-import doobie.postgres.free.{pgconnection as IPFPC}
-import doobie.postgres.hi.{pgconnection as IPHPC}
+import doobie.postgres.free.pgconnection as IPFPC
+import doobie.postgres.hi.pgconnection as IPHPC
 
 /** Module of safe `PGConnectionIO` operations lifted into `ConnectionIO`. */
 object connection {
diff --git a/modules/postgres/src/main/scala/doobie/postgres/hi/largeobject.scala b/modules/postgres/src/main/scala/doobie/postgres/hi/largeobject.scala
@@ -7,7 +7,7 @@ package doobie.postgres.hi
 import cats.syntax.all.*
 import doobie.util.io.IOActions
 import java.io.{File, InputStream, OutputStream}
-import doobie.postgres.free.{largeobject as IPFLO}
+import doobie.postgres.free.largeobject as IPFLO
 
 object largeobject {
   import implicits.*
diff --git a/modules/postgres/src/main/scala/doobie/postgres/hi/largeobjectmanager.scala b/modules/postgres/src/main/scala/doobie/postgres/hi/largeobjectmanager.scala
@@ -8,7 +8,7 @@ import cats.syntax.all.*
 import doobie.postgres.implicits.*
 import java.io.{File, OutputStream, InputStream}
 import doobie.postgres.free.{largeobjectmanager as IPFLOM, largeobject as IPFLO}
-import doobie.postgres.hi.{largeobject as IPHLO}
+import doobie.postgres.hi.largeobject as IPHLO
 
 object largeobjectmanager {
 
diff --git a/modules/postgres/src/main/scala/doobie/postgres/hi/lostreaming.scala b/modules/postgres/src/main/scala/doobie/postgres/hi/lostreaming.scala
@@ -8,7 +8,7 @@ import cats.syntax.functor.*
 import doobie.ConnectionIO
 import doobie.implicits.*
 import doobie.postgres.free.{largeobjectmanager as IIPFLOM, largeobject as IPFLO}
-import doobie.postgres.hi.{connection as IPHC}
+import doobie.postgres.hi.connection as IPHC
 import fs2.Stream
 import java.io.{InputStream, OutputStream}
 import org.postgresql.largeobject.LargeObject
diff --git a/modules/postgres/src/main/scala/doobie/postgres/hi/pgconnection.scala b/modules/postgres/src/main/scala/doobie/postgres/hi/pgconnection.scala
@@ -5,7 +5,7 @@
 package doobie.postgres.hi
 
 import org.postgresql.PGNotification
-import doobie.postgres.free.{pgconnection as IPFPC}
+import doobie.postgres.free.pgconnection as IPFPC
 
 object pgconnection {
 
diff --git a/modules/postgres/src/main/scala/doobie/postgres/syntax/FragmentSyntax.scala b/modules/postgres/src/main/scala/doobie/postgres/syntax/FragmentSyntax.scala
@@ -11,7 +11,7 @@ import cats.syntax.all.*
 import doobie.*
 import doobie.implicits.*
 import doobie.postgres.*
-import doobie.postgres.hi.{connection as IPHC}
+import doobie.postgres.hi.connection as IPHC
 import doobie.postgres.free.{copymanager as IPFCM, copyin as IPFCI}
 import fs2.*
 
diff --git a/modules/postgres/src/test/scala/doobie/postgres/NotifySuite.scala b/modules/postgres/src/test/scala/doobie/postgres/NotifySuite.scala
@@ -12,7 +12,7 @@ import org.postgresql.PGNotification
 import scala.concurrent.duration.*
 
 class NotifySuite extends munit.CatsEffectSuite {
-  import FC.{commit}
+  import FC.commit
   import PostgresTestTransactor.xa
 
   // Listen on the given channel, notify on another connection
diff --git a/modules/specs2/src/main/scala/doobie/specs2/analysisspec.scala b/modules/specs2/src/main/scala/doobie/specs2/analysisspec.scala
@@ -11,7 +11,7 @@ import doobie.util.query.{Query, Query0}
 import doobie.util.testing.*
 import org.specs2.mutable.Specification
 import org.specs2.specification.core.{Fragment, Fragments}
-import org.specs2.specification.create.{FormattingFragments as Format}
+import org.specs2.specification.create.FormattingFragments as Format
 import org.specs2.specification.dsl.Online.*
 import org.tpolecat.typename.*
 
diff --git a/project/FreeGen2.scala b/project/FreeGen2.scala

Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,6 @@ fileOverride {`
`30`	`30`	`project.excludeFilters = [`
`31`	`31`	`"scalafix/*"`
`32`	`32`	`]`
	`33`	`+`
	`34`	`+rewrite.scala3.convertToNewSyntax = true`
	`35`	`+rewrite.scala3.newSyntax.control = false`