Update scalafmt-core to 3.8.4 (#1017)

scala-steward · web-flow · commit 0037d018122a · 2025-01-14T10:54:23.000-08:00
## About this PR 📦 Updates [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt) from `3.8.3` to `3.8.4` 📜 [GitHub Release Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.8.4) - [Version Diff](scalameta/scalafmt@v3.8.3...v3.8.4) ## Usage ✅ **Please merge!** I'll automatically update this PR to resolve conflicts as long as you don't change it yourself. If you'd like to skip this version, you can just close this PR. If you have any feedback, just mention me in the comments below. Configure Scala Steward for your repository with a [`.scala-steward.conf`](https://github.com/scala-steward-org/scala-steward/blob/ba2bf8be3a0bdbe1ea6198b7970d13a754e707bf/docs/repo-specific-configuration.md) file. _Have a fantastic day writing Scala!_ <details> <summary>⚙ Adjust future updates</summary> Add this to your `.scala-steward.conf` file to ignore future updates of this dependency: ``` updates.ignore = [ { groupId = "org.scalameta", artifactId = "scalafmt-core" } ] ``` Or, add this to slow down future updates of this dependency: ``` dependencyOverrides = [{ pullRequests = { frequency = "30 days" }, dependency = { groupId = "org.scalameta", artifactId = "scalafmt-core" } }] ``` </details> <sup> labels: library-update, early-semver-patch, semver-spec-patch, commit-count:n:3 </sup>
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -12,3 +12,6 @@ f81a64c5ec05830cf56f08da300bed96a1fed672
 
 # Scala Steward: Reformat with scalafmt 3.8.2
 ffed0cfc061504b1557427e58ba5ab65fb897aa7
+
+# Scala Steward: Reformat with scalafmt 3.8.4
+1bb8fdbb77055814317751f20973920c56d2432f
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.3"
+version = "3.8.4"
 runner.dialect = scala3
 rewrite.rules = [SortModifiers, Imports]
 rewrite.imports.expand = true
diff --git a/kyo-bench/src/main/scala/kyo/bench/TestHttpServer.scala b/kyo-bench/src/main/scala/kyo/bench/TestHttpServer.scala
@@ -67,8 +67,7 @@ object TestHttpServer:
             Runtime.getRuntime().addShutdownHook(new Thread:
                 override def run(): Unit =
                     log(port, "stopping")
-                    process.destroy()
-            )
+                    process.destroy())
             redirect(process.getInputStream, System.out)
             redirect(process.getErrorStream, System.err)
 
@@ -91,8 +90,7 @@ object TestHttpServer:
                 while { line = reader.readLine(); line != null } do
                     writer.println(s"[TestHttpServer] $line")
                     writer.flush()
-            end run
-        )
+            end run)
         thread.setDaemon(true)
         thread.start()
     end redirect
diff --git a/kyo-bench/src/main/scala/kyo/bench/ZIORuntime.scala b/kyo-bench/src/main/scala/kyo/bench/ZIORuntime.scala
@@ -8,6 +8,7 @@ extension (parent: ZLayer[Any, Any, Any])
             parent ++ child
         else
             child
+end extension
 
 object ZIORuntime:
     def fromLayerWithFinalizer[R](layer: ZLayer[Any, Any, R]): (Runtime[R], () => Unit) =
diff --git a/kyo-caliban/src/test/scala/kyo/ResolversTest.scala b/kyo-caliban/src/test/scala/kyo/ResolversTest.scala
@@ -66,8 +66,7 @@ class ResolverTest extends Test:
             yield v + s.length
         )))
         val layer = ZLayer.succeed(new Runner[Environment]:
-            def apply[A: Flat](v: A < Environment): Task[A] = ZIOs.run(Env.run("kyo")(Var.run(0)(v)))
-        )
+            def apply[A: Flat](v: A < Environment): Task[A] = ZIOs.run(Env.run("kyo")(Var.run(0)(v))))
         for
             interpreter <- api.interpreter
             res         <- interpreter.execute("{ k }").provide(layer)
diff --git a/kyo-combinators/shared/src/main/scala/kyo/Combinators.scala b/kyo-combinators/shared/src/main/scala/kyo/Combinators.scala
@@ -912,6 +912,7 @@ extension [A, S](effect: Ack < (Emit[Chunk[A]] & S))
       *   Stream representation of original effect
       */
     def emitToStream: Stream[A, S] = Stream(effect)
+end extension
 
 private case object FinalEmit
 
diff --git a/kyo-combinators/shared/src/main/scala/kyo/Constructors.scala b/kyo-combinators/shared/src/main/scala/kyo/Constructors.scala
@@ -389,7 +389,10 @@ extension (kyoObject: Kyo.type)
       * @return
       *   An effect that retrieves the dependency from Env and applies the function to it
       */
-    def serviceWith[D](using Tag[D], Frame): [A, S] => (D => A < S) => A < (S & Env[D]) =
+    def serviceWith[D](using
+        Tag[D],
+        Frame
+    ): [A, S] => (D => A < S) => A < (S & Env[D]) =
         [A, S] => (fn: D => (A < S)) => service[D].map(d => fn(d))
 
     /** Sleeps for a given duration using Async.
diff --git a/kyo-combinators/shared/src/test/scala/kyo/FiberCombinatorTest.scala b/kyo-combinators/shared/src/test/scala/kyo/FiberCombinatorTest.scala
@@ -62,8 +62,7 @@ class FiberCombinatorTest extends Test:
                     }.map { handledEffect =>
                         assert(handledEffect match
                             case Result.Fail(_: Timeout) => true
-                            case _                       => false
-                        )
+                            case _                       => false)
                     }
                 }
             }
diff --git a/kyo-core/jvm/src/main/scala/kyo/StreamCompression.scala b/kyo-core/jvm/src/main/scala/kyo/StreamCompression.scala
@@ -270,7 +270,8 @@ object StreamCompression:
                             compressionLevel match
                                 case CompressionLevel.BestSpeed       => 0x4
                                 case CompressionLevel.BestCompression => 0x2
-                                case _                                => 0
+                                case _ =>
+                                    0
                             ,    // XFL: Extra flags
                             0xff // OS: Operating System
                         ).map(_.toByte)
diff --git a/kyo-core/shared/src/main/scala/kyo/scheduler/IOTask.scala b/kyo-core/shared/src/main/scala/kyo/scheduler/IOTask.scala
@@ -40,7 +40,8 @@ sealed private[kyo] class IOTask[Ctx, E, A] private (
         try
             curr = Boundary.restoring(trace, this) {
                 ArrowEffect.handlePartial(erasedAbortTag, Tag[Async.Join], curr, context)(
-                    stop = shouldPreempt(),
+                    stop =
+                        shouldPreempt(),
                     [C] =>
                         (input, cont) =>
                             locally {
diff --git a/kyo-core/shared/src/test/scala/kyo/ConsoleTest.scala b/kyo-core/shared/src/test/scala/kyo/ConsoleTest.scala
@@ -38,11 +38,9 @@ class ConsoleTest extends Test:
         val output = new StringBuilder
         val error  = new StringBuilder
         scala.Console.withOut(new java.io.PrintStream(new java.io.OutputStream:
-            override def write(b: Int): Unit = output.append(b.toChar)
-        )) {
+            override def write(b: Int): Unit = output.append(b.toChar))) {
             scala.Console.withErr(new java.io.PrintStream(new java.io.OutputStream:
-                override def write(b: Int): Unit = error.append(b.toChar)
-            )) {
+                override def write(b: Int): Unit = error.append(b.toChar))) {
                 import AllowUnsafe.embrace.danger
                 val (r1, r2, r3, r4) =
                     IO.Unsafe.evalOrThrow {
diff --git a/kyo-core/shared/src/test/scala/kyo/LogTest.scala b/kyo-core/shared/src/test/scala/kyo/LogTest.scala
@@ -40,8 +40,7 @@ class LogTest extends Test:
     "withConsoleLogger" in {
         val output = new StringBuilder
         scala.Console.withOut(new java.io.PrintStream(new java.io.OutputStream:
-            override def write(b: Int): Unit = output.append(b.toChar)
-        )) {
+            override def write(b: Int): Unit = output.append(b.toChar))) {
             import AllowUnsafe.embrace.danger
             IO.Unsafe.evalOrThrow {
                 for
diff --git a/kyo-data/shared/src/main/scala/kyo/Duration.scala b/kyo-data/shared/src/main/scala/kyo/Duration.scala
@@ -225,6 +225,7 @@ object Duration:
                     case None =>
                         s"$nanos.nanos"
                 end match
+
         /** Checks if the Duration is finite.
           *
           * @return
diff --git a/kyo-data/shared/src/main/scala/kyo/KyoException.scala b/kyo-data/shared/src/main/scala/kyo/KyoException.scala
@@ -9,9 +9,11 @@ class KyoException private[kyo] (
     cause: Text | Throwable | Null = null
 )(using val frame: Frame) extends Exception(
         Option(message) match
-            case Some(message) => message.toString; case _ => null,
+            case Some(message) => message.toString;
+            case _             => null,
         cause match
-            case cause: Throwable => cause; case _ => null
+            case cause: Throwable => cause;
+            case _                => null
     ) with NoStackTrace:
 
     override def getCause(): Throwable =
diff --git a/kyo-data/shared/src/main/scala/kyo/Record.scala b/kyo-data/shared/src/main/scala/kyo/Record.scala
@@ -153,6 +153,7 @@ object Record:
           */
         def compact(using AsFields[Fields]): Record[Fields] =
             Record(self.toMap.view.filterKeys(AsFields[Fields].contains(_)).toMap)
+    end extension
 
     extension (self: String)
         /** Creates a single-field Record with the string as the field name.
@@ -162,6 +163,7 @@ object Record:
           */
         def ~[Value](value: Value)(using tag: Tag[Value]): Record[self.type ~ Value] =
             Record(Map.empty.updated(Field(self, tag), value))
+    end extension
 
     /** Type class for converting types to Records.
       *
diff --git a/kyo-data/shared/src/main/scala/kyo/Render.scala b/kyo-data/shared/src/main/scala/kyo/Render.scala
@@ -97,3 +97,4 @@ extension (sc: StringContext)
             text = text + ai.next
             text = text + StringContext.processEscapes(pi.next())
         text
+end extension
diff --git a/kyo-data/shared/src/main/scala/kyo/Result.scala b/kyo-data/shared/src/main/scala/kyo/Result.scala
@@ -280,6 +280,7 @@ object Result:
             self match
                 case self: Fail[E] => self.error
                 case self: Panic   => self.exception
+    end extension
 
     /** Provides extension methods for Result type */
     extension [E, A](self: Result[E, A])
diff --git a/kyo-data/shared/src/test/scala/kyo/ResultTest.scala b/kyo-data/shared/src/test/scala/kyo/ResultTest.scala
@@ -601,8 +601,7 @@ class ResultTest extends Test:
             assert(!panic.isFail)
             assert(panic match
                 case Panic(_) => true
-                case _        => false
-            )
+                case _        => false)
         }
 
         "deeply nested Success/Fail" in {
@@ -625,8 +624,7 @@ class ResultTest extends Test:
             assert(combined.isFail)
             assert(combined match
                 case Fail(_: String | _: Int) => true
-                case _                        => false
-            )
+                case _                        => false)
         }
 
         "nested flatMap with type changes" in {
diff --git a/kyo-kernel/shared/src/main/scala/kyo/kernel/Boundary.scala b/kyo-kernel/shared/src/main/scala/kyo/kernel/Boundary.scala
@@ -34,6 +34,7 @@ object Boundary:
                 def frame = _frame
                 def apply(v: Unit, context: Context)(using safepoint: Safepoint) =
                     f(safepoint.saveTrace(), context.inherit)
+    end extension
 
     inline given derive[Ctx, S]: Boundary[Ctx, S] = ${ boundaryImpl[Ctx, S] }
 
diff --git a/kyo-kernel/shared/src/main/scala/kyo/kernel/Pending.scala b/kyo-kernel/shared/src/main/scala/kyo/kernel/Pending.scala
@@ -214,6 +214,7 @@ object `<`:
                     case v =>
                         v.asInstanceOf[A]
             flattenLoop(v)
+    end extension
 
     extension [A](inline v: A < Any)
 
diff --git a/kyo-kernel/shared/src/test/scala/kyo/kernel/ArrowEffectTest.scala b/kyo-kernel/shared/src/test/scala/kyo/kernel/ArrowEffectTest.scala
@@ -272,7 +272,8 @@ class ArrowEffectTest extends Test:
                 x,
                 Context.empty
             )(
-                stop = false,
+                stop =
+                    false,
                 [C] => (input, cont) => cont(input.toString),
                 [C] => (input, cont) => cont(input.toInt)
             )
@@ -287,7 +288,8 @@ class ArrowEffectTest extends Test:
                 x,
                 Context.empty
             )(
-                stop = false,
+                stop =
+                    false,
                 [C] => (input, cont) => cont(input.toString),
                 [C] => (input, cont) => cont(input.toInt)
             )
@@ -303,10 +305,12 @@ class ArrowEffectTest extends Test:
                 x,
                 Context.empty
             )(
-                stop = true,
+                stop =
+                    true,
                 [C] =>
                     (input, cont) =>
-                        called = true; cont(input.toString)
+                        called = true;
+                        cont(input.toString)
                 ,
                 [C] =>
                     (input, cont) =>
@@ -324,7 +328,8 @@ class ArrowEffectTest extends Test:
                 x,
                 Context.empty
             )(
-                stop = false,
+                stop =
+                    false,
                 [C] => (input, cont) => cont(input.toString),
                 [C] => (input, cont) => cont(input.toInt)
             )
diff --git a/kyo-reactive-streams/shared/src/main/scala/kyo/interop/flow/StreamPublisher.scala b/kyo-reactive-streams/shared/src/main/scala/kyo/interop/flow/StreamPublisher.scala
@@ -36,8 +36,7 @@ object StreamPublisher:
         def discardSubscriber(subscriber: Subscriber[? >: V]): Unit =
             subscriber.onSubscribe(new Subscription:
                 override def request(n: Long): Unit = ()
-                override def cancel(): Unit         = ()
-            )
+                override def cancel(): Unit         = ())
             subscriber.onComplete()
         end discardSubscriber
 
diff --git a/kyo-stm/shared/src/test/scala/kyo/STMTest.scala b/kyo-stm/shared/src/test/scala/kyo/STMTest.scala
@@ -688,12 +688,12 @@ class STMTest extends Test:
                             }
                             _ <- fiber.get
                         yield
-                        // The transaction will keep failing until it reaches the
-                        // retry limit because the ref is changed by the nested
-                        // fiber concurrently. The transactions in the nested
-                        // fibers executed on each try succeed, updating the ref
-                        // to 2.
-                        ()
+                            // The transaction will keep failing until it reaches the
+                            // retry limit because the ref is changed by the nested
+                            // fiber concurrently. The transactions in the nested
+                            // fibers executed on each try succeed, updating the ref
+                            // to 2.
+                            ()
                     }
                 }
                 value <- STM.run(ref.get)
diff --git a/kyo-tapir/shared/src/main/scala/kyo/server/NettyKyoServer.scala b/kyo-tapir/shared/src/main/scala/kyo/server/NettyKyoServer.scala
@@ -161,8 +161,16 @@ case class NettyKyoServer(
         ).flatMap { _ =>
             nettyFutureToScala(ch.close()).flatMap { _ =>
                 if config.shutdownEventLoopGroupOnClose then
-                    nettyFutureToScala(eventLoopGroup.shutdownGracefully(timeout, timeout, java.util.concurrent.TimeUnit.NANOSECONDS)).unit.andThen {
-                        nettyFutureToScala(eventExecutor.shutdownGracefully(timeout, timeout, java.util.concurrent.TimeUnit.NANOSECONDS)).unit
+                    nettyFutureToScala(eventLoopGroup.shutdownGracefully(
+                        timeout,
+                        timeout,
+                        java.util.concurrent.TimeUnit.NANOSECONDS
+                    )).unit.andThen {
+                        nettyFutureToScala(eventExecutor.shutdownGracefully(
+                            timeout,
+                            timeout,
+                            java.util.concurrent.TimeUnit.NANOSECONDS
+                        )).unit
                     }
                 else ()
             }
diff --git a/kyo-zio/shared/src/main/scala/kyo/ZIOs.scala b/kyo-zio/shared/src/main/scala/kyo/ZIOs.scala
@@ -81,6 +81,7 @@ object ZIOs:
             exit match
                 case Exit.Success(a)     => Result.success(a)
                 case Exit.Failure(cause) => cause.toError
+    end extension
 
     extension [E](cause: zio.Cause[E])
         /** Converts a zio.Cause to a kyo.Result.Error.
diff --git a/project/Repeat.scala b/project/Repeat.scala

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.8.3"`
	`1`	`+version = "3.8.4"`
`2`	`2`	`runner.dialect = scala3`
`3`	`3`	`rewrite.rules = [SortModifiers, Imports]`
`4`	`4`	`rewrite.imports.expand = true`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ class FiberCombinatorTest extends Test:`
`62`	`62`	`}.map { handledEffect =>`
`63`	`63`	`assert(handledEffect match`
`64`	`64`	`case Result.Fail(_: Timeout) => true`
`65`		`- case _ => false`
`66`		`- )`
	`65`	`+ case _ => false)`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`	`}`