scalafmt

scala · Nov 25, 2022 · 185066a · 185066a
1 parent 590c6f1
commit 185066a
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 54 deletions.
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala
@@ -1508,11 +1508,11 @@ object LazyList extends SeqFactory[LazyList] {
 
     private[this] def readObject(in: ObjectInputStream): Unit = {
       in.defaultReadObject()
-      val init = new mutable.ListBuffer[A]
+      val init     = new mutable.ListBuffer[A]
       var initRead = false
       while (!initRead) in.readObject match {
         case SerializeEnd => initRead = true
-        case a => init += a.asInstanceOf[A]
+        case a            => init += a.asInstanceOf[A]
       }
       val tail = in.readObject().asInstanceOf[LazyList[A]]
       // scala/scala#10118: caution that no code path can evaluate `tail.state`

diff --git a/compat/src/test/scala/test/scala/collection/LazyListTest.scala b/compat/src/test/scala/test/scala/collection/LazyListTest.scala
@@ -22,73 +22,78 @@ import scala.collection.mutable.{Builder, ListBuffer}
 import scala.util.Try
 
 class LazyListTest {
-  
+
   @Test
-  def serialization(): Unit = if (scala.util.Properties.releaseVersion.exists(_.startsWith("2.12"))) {
-    import java.io._
-
-    def serialize(obj: AnyRef): Array[Byte] = {
-      val buffer = new ByteArrayOutputStream
-      val out = new ObjectOutputStream(buffer)
-      out.writeObject(obj)
-      buffer.toByteArray
-    }
+  def serialization(): Unit =
+    if (scala.util.Properties.releaseVersion.exists(_.startsWith("2.12"))) {
+      import java.io._
 
-    def deserialize(a: Array[Byte]): AnyRef = {
-      val in = new ObjectInputStream(new ByteArrayInputStream(a))
-      in.readObject
-    }
+      def serialize(obj: AnyRef): Array[Byte] = {
+        val buffer = new ByteArrayOutputStream
+        val out    = new ObjectOutputStream(buffer)
+        out.writeObject(obj)
+        buffer.toByteArray
+      }
 
-    def serializeDeserialize[T <: AnyRef](obj: T) = deserialize(serialize(obj)).asInstanceOf[T]
+      def deserialize(a: Array[Byte]): AnyRef = {
+        val in = new ObjectInputStream(new ByteArrayInputStream(a))
+        in.readObject
+      }
 
-    val l = LazyList.from(10)
+      def serializeDeserialize[T <: AnyRef](obj: T) = deserialize(serialize(obj)).asInstanceOf[T]
 
-    val ld1 = serializeDeserialize(l)
-    assertEquals(l.take(10).toList, ld1.take(10).toList)
+      val l = LazyList.from(10)
 
-    l.tail.head
-    val ld2 = serializeDeserialize(l)
-    assertEquals(l.take(10).toList, ld2.take(10).toList)
-
-    LazyListTest.serializationForceCount = 0
-    val u = LazyList.from(10).map(x => { LazyListTest.serializationForceCount += 1; x })
-
-    def printDiff(): Unit = {
-      val a = serialize(u)
-      classOf[LazyList[_]].getDeclaredField("scala$collection$compat$immutable$LazyList$$stateEvaluated").setBoolean(u, true)
-      val b = serialize(u)
-      val i = a.zip(b).indexWhere(p => p._1 != p._2)
-      println("difference: ")
-      println(s"val from = ${a.slice(i - 10, i + 10).mkString("List[Byte](", ", ", ")")}")
-      println(s"val to   = ${b.slice(i - 10, i + 10).mkString("List[Byte](", ", ", ")")}")
-    }
+      val ld1 = serializeDeserialize(l)
+      assertEquals(l.take(10).toList, ld1.take(10).toList)
 
-    // to update this test, comment-out `LazyList.writeReplace` and run `printDiff`
-    // printDiff()
+      l.tail.head
+      val ld2 = serializeDeserialize(l)
+      assertEquals(l.take(10).toList, ld2.take(10).toList)
 
-    val from = List[Byte](83, 116, 97, 116, 101, 59, 120, 112, 0, 0, 0, 115, 114, 0, 33, 106, 97, 118, 97, 46)
-    val to   = List[Byte](83, 116, 97, 116, 101, 59, 120, 112, 0, 0, 1, 115, 114, 0, 33, 106, 97, 118, 97, 46)
+      LazyListTest.serializationForceCount = 0
+      val u = LazyList.from(10).map(x => { LazyListTest.serializationForceCount += 1; x })
 
-    assertEquals(LazyListTest.serializationForceCount, 0)
+      def printDiff(): Unit = {
+        val a = serialize(u)
+        classOf[LazyList[_]]
+          .getDeclaredField("scala$collection$compat$immutable$LazyList$$stateEvaluated")
+          .setBoolean(u, true)
+        val b = serialize(u)
+        val i = a.zip(b).indexWhere(p => p._1 != p._2)
+        println("difference: ")
+        println(s"val from = ${a.slice(i - 10, i + 10).mkString("List[Byte](", ", ", ")")}")
+        println(s"val to   = ${b.slice(i - 10, i + 10).mkString("List[Byte](", ", ", ")")}")
+      }
 
-    u.head
-    assertEquals(LazyListTest.serializationForceCount, 1)
+      // to update this test, comment-out `LazyList.writeReplace` and run `printDiff`
+      // printDiff()
 
-    val data = serialize(u)
-    var i = data.indexOfSlice(from)
-    to.foreach(x => {data(i) = x; i += 1})
+      val from = List[Byte](83, 116, 97, 116, 101, 59, 120, 112, 0, 0, 0, 115, 114, 0, 33, 106, 97,
+        118, 97, 46)
+      val to = List[Byte](83, 116, 97, 116, 101, 59, 120, 112, 0, 0, 1, 115, 114, 0, 33, 106, 97,
+        118, 97, 46)
 
-    val ud1 = deserialize(data).asInstanceOf[LazyList[Int]]
+      assertEquals(LazyListTest.serializationForceCount, 0)
 
-    // this check failed before scala/scala#10118, deserialization triggered evaluation
-    assertEquals(LazyListTest.serializationForceCount, 1)
+      u.head
+      assertEquals(LazyListTest.serializationForceCount, 1)
 
-    ud1.tail.head
-    assertEquals(LazyListTest.serializationForceCount, 2)
+      val data = serialize(u)
+      var i    = data.indexOfSlice(from)
+      to.foreach(x => { data(i) = x; i += 1 })
 
-    u.tail.head
-    assertEquals(LazyListTest.serializationForceCount, 3)
-  }
+      val ud1 = deserialize(data).asInstanceOf[LazyList[Int]]
+
+      // this check failed before scala/scala#10118, deserialization triggered evaluation
+      assertEquals(LazyListTest.serializationForceCount, 1)
+
+      ud1.tail.head
+      assertEquals(LazyListTest.serializationForceCount, 2)
+
+      u.tail.head
+      assertEquals(LazyListTest.serializationForceCount, 3)
+    }
 
   @Test
   def t6727_and_t6440_and_8627(): Unit = {