diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 6f3dbb49e1..41d489af15 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -21,3 +21,6 @@ e5525d3f0da44052fdcfbe844993260bdc044270
 
 # Scala Steward: Reformat with scalafmt 3.8.2
 a0a37ece16ee55056270b4d9ba5c1505ead8af17
+
+# Scala Steward: Reformat with scalafmt 3.8.5
+af56fda3d44f2e3ab32d7d06ab52e330bf635e73
diff --git a/.scalafmt.conf b/.scalafmt.conf
index a9703df6a1..135e4af10a 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.2"
+version = "3.8.5"
 
 style = default
 
diff --git a/core/shared/src/main/scala/fs2/concurrent/Signal.scala b/core/shared/src/main/scala/fs2/concurrent/Signal.scala
index 375e105e98..e918ccafcc 100644
--- a/core/shared/src/main/scala/fs2/concurrent/Signal.scala
+++ b/core/shared/src/main/scala/fs2/concurrent/Signal.scala
@@ -481,8 +481,11 @@ object SignallingMapRef {
       .map { case (state, ids) =>
         def newId = ids.getAndUpdate(_ + 1)
 
-        def updateAndNotify[U](state: State, k: K, f: Option[V] => (Option[V], U))
-            : (State, F[U]) = {
+        def updateAndNotify[U](
+            state: State,
+            k: K,
+            f: Option[V] => (Option[V], U)
+        ): (State, F[U]) = {
 
           val keyState = state.keys.get(k)
 
diff --git a/core/shared/src/test/scala/fs2/StreamPerformanceSuite.scala b/core/shared/src/test/scala/fs2/StreamPerformanceSuite.scala
index 2f7e188205..b1787e10bf 100644
--- a/core/shared/src/test/scala/fs2/StreamPerformanceSuite.scala
+++ b/core/shared/src/test/scala/fs2/StreamPerformanceSuite.scala
@@ -198,9 +198,8 @@ class StreamPerformanceSuite extends Fs2Suite {
                 val s: Stream[SyncIO, Int] =
                   List
                     .fill(N)(bracketed)
-                    .foldLeft(Stream.raiseError[SyncIO](new Err): Stream[SyncIO, Int]) {
-                      (acc, hd) =>
-                        acc.handleErrorWith(_ => hd)
+                    .foldLeft(Stream.raiseError[SyncIO](new Err): Stream[SyncIO, Int]) { (acc, hd) =>
+                      acc.handleErrorWith(_ => hd)
                     }
                 s.compile.toList.attempt
                   .flatMap(_ => (ok.get, open.get).tupled)
diff --git a/io/jvm/src/test/scala/fs2/io/IoPlatformSuite.scala b/io/jvm/src/test/scala/fs2/io/IoPlatformSuite.scala
index 94a31f0f64..c5bc17b561 100644
--- a/io/jvm/src/test/scala/fs2/io/IoPlatformSuite.scala
+++ b/io/jvm/src/test/scala/fs2/io/IoPlatformSuite.scala
@@ -64,12 +64,11 @@ class IoPlatformSuite extends Fs2Suite {
                 (bs1.length != (o1 + l1)) &&
                 // we expect that next slice will wrap same buffer
                 ((bs2 eq bs1) && (o2 == o1 + l1))
-              } || {
-                // if first slice buffer is 'full'
-                (bs2.length == (o1 + l1)) &&
-                // we expect new buffer allocated for next slice
-                ((bs2 ne bs1) && (o2 == 0))
-              }
+              } ||
+              // if first slice buffer is 'full'
+              (bs2.length == (o1 + l1)) &&
+              // we expect new buffer allocated for next slice
+              ((bs2 ne bs1) && (o2 == 0))
             case _ => false // unexpected chunk subtype
           }
       }
diff --git a/protocols/shared/src/main/scala-2/fs2/protocols/pcapng/BlockCodec.scala b/protocols/shared/src/main/scala-2/fs2/protocols/pcapng/BlockCodec.scala
index 3d8805b83d..e7884e304b 100644
--- a/protocols/shared/src/main/scala-2/fs2/protocols/pcapng/BlockCodec.scala
+++ b/protocols/shared/src/main/scala-2/fs2/protocols/pcapng/BlockCodec.scala
@@ -44,8 +44,9 @@ object BlockCodec {
     ("Block Total Length"     | constant(length.bv)                 )}
   // format: on
 
-  def unknownByteOrder[L <: HList, LB <: HList](hexConstant: ByteVector)(f: Length => Codec[L])(
-      implicit
+  def unknownByteOrder[L <: HList, LB <: HList](
+      hexConstant: ByteVector
+  )(f: Length => Codec[L])(implicit
       prepend: Prepend.Aux[L, Unit :: HNil, LB],
       init: Init.Aux[LB, L],
       last: Last.Aux[LB, Unit]