Merge pull request #2183 from typelevel/scalafmt_3.8.6

Scalafmt 3.8.6

Author: jatcwang

.git-blame-ignore-revs

@@ -3,3 +3,6 @@
 8c04f656ec5e21d6142ebde4539a00003b27a499
 f6e03013f4c4a29074f528ac468129bdd2df63d3
 13d6c997bb231bbae2bb1a9427d0fc4eb226e853
+
+# Upgrade to scalafmt 3.8.6
+1c373a90e8fd788b666b037150e8912427708726

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.8.2
+version=3.8.6
 maxColumn = 120
 assumeStandardLibraryStripMargin = true
 

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

@@ -50,7 +50,8 @@ class LargeRow {
                   col8 VARCHAR(50)
               );""".update.run
       _ <- sql"select setseed(0.5)".query[Unit].unique // deterministic seed
-      _ <- sql"""INSERT INTO data (col1, col2, col3, col4, col5, col6, col7, col8)
+      _ <-
+        sql"""INSERT INTO data (col1, col2, col3, col4, col5, col6, col7, col8)
               SELECT random(), random() :: text, (random() * 1000) :: int, random() :: text, random(), random(), random() :: text, random() :: text
               FROM generate_series(1, 10000)
           """.update.run
@@ -74,7 +75,15 @@ class LargeRow {
   @Benchmark
   def tupleOpt(bh: Blackhole): Unit = {
     bh.consume(sql"""SELECT col1, col2, col3, col4, col5, col6, col7, col8 FROM data"""
-      .query[Option[(Double, String, Int, String, Double, Double, String, String)]].to[List].transact(xa).unsafeRunSync())
+      .query[Option[(
+          Double,
+          String,
+          Int,
+          String,
+          Double,
+          Double,
+          String,
+          String)]].to[List].transact(xa).unsafeRunSync())
   }
 
   @Benchmark

modules/core/src/main/scala-3/doobie/util/MkWritePlatform.scala

@@ -32,7 +32,9 @@ trait MkWritePlatform:
     new Derived(
       new MkWrite(Write.Composite(
         List(headInstance),
-        { case h *: EmptyTuple => List(h) }
+        { case h *: EmptyTuple =>
+          List(h)
+        }
       ))
     )
   }
@@ -49,7 +51,9 @@ trait MkWritePlatform:
     new Derived(
       new MkWrite(Write.Composite(
         List(headWrite, tailWrite),
-        { case h *: t => List(h, t) }
+        { case h *: t =>
+          List(h, t)
+        }
       ))
     )
   }

modules/core/src/main/scala/doobie/util/analysis.scala

@@ -70,7 +70,9 @@ object analysis {
     override def msg = this match {
       case ColumnMisalignment(_, Left((get, n))) =>
         s"""|Too few columns are selected, which will result in a runtime failure. Add a column or
-            |remove mapped ${typeName(get.typeStack.last, n)} from the result type.""".stripMargin.linesIterator.mkString(
+            |remove mapped ${typeName(
+             get.typeStack.last,
+             n)} from the result type.""".stripMargin.linesIterator.mkString(
           " ")
       case ColumnMisalignment(_, Right(_)) =>
         s"""Column is unused. Remove it from the SELECT statement."""

modules/core/src/main/scala/doobie/util/invariant.scala

@@ -55,8 +55,10 @@ object invariant {
   final case class NonNullableColumnUpdate(index: Int, jdbcType: JdbcType)
       extends MappingViolation(
         show"Scala `null` value passed as update to column $index (JDBC type $jdbcType); use an Option type here. $oneBasedDisclaimer")
-  final case class NonNullableColumnRead(index: Int, jdbcType: JdbcType)
-      extends MappingViolation(show"SQL `NULL` read at column $index (JDBC type $jdbcType) but mapping is to a non-Option type; use Option here. $oneBasedDisclaimer")
+  final case class NonNullableColumnRead(
+      index: Int,
+      jdbcType: JdbcType
+  ) extends MappingViolation(show"SQL `NULL` read at column $index (JDBC type $jdbcType) but mapping is to a non-Option type; use Option here. $oneBasedDisclaimer")
 
   /** Array violations. Not terribly illuminating at this point. */
   sealed abstract class ArrayStructureViolation(msg: String) extends InvariantViolation(msg)

modules/core/src/main/scala/doobie/util/meta/meta.scala

@@ -181,7 +181,8 @@ trait MetaInstances {
       List(TinyInt, Integer, BigInt, Real, Float, Double, Decimal, Numeric, Bit, Char, VarChar, LongVarChar),
       _.getShort(_),
       _.setShort(_, _),
-      _.updateShort(_, _))
+      _.updateShort(_, _)
+    )
 
   /** @group Instances */
   implicit val IntMeta: Meta[Int] =
@@ -208,7 +209,8 @@ trait MetaInstances {
       List(TinyInt, Integer, SmallInt, BigInt, Float, Double, Decimal, Numeric, Bit, Char, VarChar, LongVarChar),
       _.getFloat(_),
       _.setFloat(_, _),
-      _.updateFloat(_, _))
+      _.updateFloat(_, _)
+    )
 
   /** @group Instances */
   implicit val DoubleMeta: Meta[Double] =

modules/example/src/main/scala/example/StreamingCopy.scala

@@ -137,7 +137,8 @@ object StreamingCopy extends IOApp.Simple {
     url = "jdbc:postgresql:world",
     user = "postgres",
     password = "password",
-    logHandler = None
+    logHandler =
+      None
   ))
 
   // An h2 transactor for our sink.

modules/free/src/main/scala/doobie/free/blob.scala

@@ -233,6 +233,6 @@ object blob { module =>
   implicit def SemigroupBlobIO[A : Semigroup]: Semigroup[BlobIO[A]] = new Semigroup[BlobIO[A]] {
     override def combine(x: BlobIO[A], y: BlobIO[A]): BlobIO[A] =
       Applicative[BlobIO].product(x, y).map { case (x, y) => Semigroup[A].combine(x, y) }
-  }  
+  }
 }
 

modules/free/src/main/scala/doobie/free/callablestatement.scala

@@ -1364,6 +1364,6 @@ object callablestatement { module =>
   implicit def SemigroupCallableStatementIO[A : Semigroup]: Semigroup[CallableStatementIO[A]] = new Semigroup[CallableStatementIO[A]] {
     override def combine(x: CallableStatementIO[A], y: CallableStatementIO[A]): CallableStatementIO[A] =
       Applicative[CallableStatementIO].product(x, y).map { case (x, y) => Semigroup[A].combine(x, y) }
-  }  
+  }
 }