diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 9f7a1f3..5d3b81d 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -3,3 +3,6 @@ ead57e14d463ef8e3175e933cf820220af653464
 
 # Scala Steward: Reformat with scalafmt 3.7.17
 0823f223e84d4329888f54a20d4b58da1dbec4dd
+
+# Scala Steward: Reformat with scalafmt 3.10.1
+1e6e6e075deeec3a8048132e4acd8f98f663b216
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 8c68ae6..7ff6913 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,2 +1,2 @@
-version = "3.10.0"
+version = "3.10.1"
 runner.dialect="scala213source3"
diff --git a/shared/src/main/scala/com/google/protobuf/CodedInputStream.scala b/shared/src/main/scala/com/google/protobuf/CodedInputStream.scala
index fb334e3..db5973f 100644
--- a/shared/src/main/scala/com/google/protobuf/CodedInputStream.scala
+++ b/shared/src/main/scala/com/google/protobuf/CodedInputStream.scala
@@ -308,7 +308,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
         (({
           x = buffer(({
             pos += 1; pos - 1
-          })); x
+          }));
+          x
         })) >= 0
       ) {
         bufferPos = pos
@@ -319,7 +320,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
         (({
           x ^= (buffer(({
             pos += 1; pos - 1
-          })) << 7); x
+          })) << 7);
+          x
         })) < 0
       ) {
         x ^= (~0 << 7)
@@ -327,7 +329,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
         (({
           x ^= (buffer(({
             pos += 1; pos - 1
-          })) << 14); x
+          })) << 14);
+          x
         })) >= 0
       ) {
         x ^= (~0 << 7) ^ (~0 << 14)
@@ -335,7 +338,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
         (({
           x ^= (buffer(({
             pos += 1; pos - 1
-          })) << 21); x
+          })) << 21);
+          x
         })) < 0
       ) {
         x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21)
@@ -557,7 +561,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         y = buffer(({
           pos += 1; pos - 1
-        })); y
+        }));
+        y
       })) >= 0
     ) {
       bufferPos = pos
@@ -568,7 +573,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         y ^= (buffer(({
           pos += 1; pos - 1
-        })) << 7); y
+        })) << 7);
+        y
       })) < 0
     ) {
       x = y ^ (~0 << 7)
@@ -576,7 +582,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         y ^= (buffer(({
           pos += 1; pos - 1
-        })) << 14); y
+        })) << 14);
+        y
       })) >= 0
     ) {
       x = y ^ ((~0 << 7) ^ (~0 << 14))
@@ -584,7 +591,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         y ^= (buffer(({
           pos += 1; pos - 1
-        })) << 21); y
+        })) << 21);
+        y
       })) < 0
     ) {
       x = y ^ ((~0 << 7) ^ (~0 << 14) ^ (~0 << 21))
@@ -592,7 +600,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         x = (y.toLong) ^ (buffer(({
           pos += 1; pos - 1
-        })).toLong << 28); x
+        })).toLong << 28);
+        x
       })) >= 0L
     ) {
       x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28)
@@ -600,7 +609,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         x ^= (buffer(({
           pos += 1; pos - 1
-        })).toLong << 35); x
+        })).toLong << 35);
+        x
       })) < 0L
     ) {
       x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35)
@@ -608,7 +618,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         x ^= (buffer(({
           pos += 1; pos - 1
-        })).toLong << 42); x
+        })).toLong << 42);
+        x
       })) >= 0L
     ) {
       x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35) ^ (~0L << 42)
@@ -616,7 +627,8 @@ class CodedInputStream private (buffer: Array[Byte], input: InputStream) {
       (({
         x ^= (buffer(({
           pos += 1; pos - 1
-        })).toLong << 49); x
+        })).toLong << 49);
+        x
       })) < 0L
     ) {
       x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35) ^ (~0L << 42) ^ (~0L << 49)