Resolve merge conflict and update scalafmt to 3.9.8

- Resolve merge conflict in MessagePackTest.scala by using Scala 3 compatible syntax
- Update scalafmt version from 3.9.4 to 3.9.8
- Apply formatting with updated scalafmt version

Author: xerial

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.9.4
+version = 3.9.8
 project.layout = StandardConvention
 runner.dialect = scala3
 maxColumn = 100

msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala

@@ -376,7 +376,7 @@ class MessagePackTest extends AirSpec with PropertyCheck with Benchmark:
   test("report errors when packing/unpacking malformed strings") {
     pending("We need to produce malformed utf-8 strings in Java 8")
     // Create 100 malformed UTF8 Strings
-    val r = new Random(0)
+    val r                = new Random(0)
     val malformedStrings = Iterator
       .continually {
         val b = new Array[Byte](10)

msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala

@@ -211,7 +211,7 @@ class MessagePackerTest extends AirSpec with Benchmark:
   }
 
   test("compute totalWrittenBytes") {
-    val out = new ByteArrayOutputStream
+    val out                     = new ByteArrayOutputStream
     val packerTotalWrittenBytes =
       withResource(MessagePack.newDefaultPacker(out)) { packer =>
         packer

msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala

@@ -30,7 +30,7 @@ import scala.util.Random
 
 object MessageUnpackerTest:
   class SplitMessageBufferInput(array: Array[Array[Byte]]) extends MessageBufferInput:
-    var cursor = 0
+    var cursor                         = 0
     override def next(): MessageBuffer =
       if cursor < array.length then
         val a = array(cursor)
@@ -45,7 +45,7 @@ import org.msgpack.core.MessageUnpackerTest.*
 
 class MessageUnpackerTest extends AirSpec with Benchmark:
 
-  private val universal = MessageBuffer.allocate(0).isInstanceOf[MessageBufferU]
+  private val universal             = MessageBuffer.allocate(0).isInstanceOf[MessageBufferU]
   private def testData: Array[Byte] =
     val out    = new ByteArrayOutputStream()
     val packer = MessagePack.newDefaultPacker(out)
@@ -435,7 +435,7 @@ class MessageUnpackerTest extends AirSpec with Benchmark:
       val t =
         time("skip performance", repeat = N) {
           block("v6") {
-            val v6 = new org.msgpack.MessagePack()
+            val v6       = new org.msgpack.MessagePack()
             val unpacker =
               new org.msgpack.unpacker.MessagePackUnpacker(v6, new ByteArrayInputStream(data))
             var count = 0
@@ -567,7 +567,7 @@ class MessageUnpackerTest extends AirSpec with Benchmark:
       val t =
         time("unpack performance", repeat = N) {
           block("v6") {
-            val v6 = new org.msgpack.MessagePack()
+            val v6       = new org.msgpack.MessagePack()
             val unpacker =
               new org.msgpack.unpacker.MessagePackUnpacker(v6, new ByteArrayInputStream(data))
             var count = 0
@@ -655,7 +655,7 @@ class MessageUnpackerTest extends AirSpec with Benchmark:
 
       time("unpackBinary", repeat = 100) {
         block("v6") {
-          val v6 = new org.msgpack.MessagePack()
+          val v6       = new org.msgpack.MessagePack()
           val unpacker =
             new org.msgpack.unpacker.MessagePackUnpacker(v6, new ByteArrayInputStream(b))
           var i = 0

msgpack-core/src/test/scala/org/msgpack/value/VariableTest.scala

@@ -181,39 +181,39 @@ class VariableTest extends AirSpec with PropertyCheck:
 
     test("read integers") {
       forAll { (i: Int) =>
-          check(
-            _.packInt(i),
-            checker =
-              v =>
-                val iv = validateValue(v.asIntegerValue(), asInteger = true)
-                iv.asInt() shouldBe i
-                iv.asLong() shouldBe i.toLong
-          )
+        check(
+          _.packInt(i),
+          checker =
+            v =>
+              val iv = validateValue(v.asIntegerValue(), asInteger = true)
+              iv.asInt() shouldBe i
+              iv.asLong() shouldBe i.toLong
+        )
       }
     }
 
     test("read double") {
       forAll { (x: Double) =>
-          check(
-            _.packDouble(x),
-            checker =
-              v =>
-                val iv = validateValue(v.asFloatValue(), asFloat = true)
-                // iv.toDouble shouldBe v
-                // iv.toFloat shouldBe x.toFloat
-          )
+        check(
+          _.packDouble(x),
+          checker =
+            v =>
+              val iv = validateValue(v.asFloatValue(), asFloat = true)
+              // iv.toDouble shouldBe v
+              // iv.toFloat shouldBe x.toFloat
+        )
       }
     }
 
     test("read boolean") {
       forAll { (x: Boolean) =>
-          check(
-            _.packBoolean(x),
-            checker =
-              v =>
-                val iv = validateValue(v.asBooleanValue(), asBoolean = true)
-                iv.getBoolean shouldBe x
-          )
+        check(
+          _.packBoolean(x),
+          checker =
+            v =>
+              val iv = validateValue(v.asBooleanValue(), asBoolean = true)
+              iv.getBoolean shouldBe x
+        )
       }
     }
 
@@ -234,13 +234,13 @@ class VariableTest extends AirSpec with PropertyCheck:
 
     test("read string") {
       forAll { (x: String) =>
-          check(
-            _.packString(x),
-            checker =
-              v =>
-                val iv = validateValue(v.asStringValue(), asString = true)
-                iv.asString() shouldBe x
-          )
+        check(
+          _.packString(x),
+          checker =
+            v =>
+              val iv = validateValue(v.asStringValue(), asString = true)
+              iv.asString() shouldBe x
+        )
       }
     }
 
@@ -280,7 +280,7 @@ class VariableTest extends AirSpec with PropertyCheck:
           },
           checker =
             v =>
-              val iv = validateValue(v.asMapValue(), asMap = true)
+              val iv  = validateValue(v.asMapValue(), asMap = true)
               val lst =
                 iv.map()
                   .asScala
@@ -293,15 +293,15 @@ class VariableTest extends AirSpec with PropertyCheck:
 
     test("read timestamps") {
       forAll { (millis: Long) =>
-          val i = Instant.ofEpochMilli(millis)
-          check(
-            _.packTimestamp(i),
-            checker =
-              v =>
-                val ts = validateValue(v.asTimestampValue(), asTimestamp = true)
-                ts.isTimestampValue shouldBe true
-                ts.toInstant shouldBe i
-          )
+        val i = Instant.ofEpochMilli(millis)
+        check(
+          _.packTimestamp(i),
+          checker =
+            v =>
+              val ts = validateValue(v.asTimestampValue(), asTimestamp = true)
+              ts.isTimestampValue shouldBe true
+              ts.toInstant shouldBe i
+        )
       }
     }
   }