From 50c1c42f619d347303d10375943734d817169e6a Mon Sep 17 00:00:00 2001
From: Pavel Pavlov <pavel.e.pavlov@gmail.com>
Date: Wed, 5 Feb 2014 14:44:19 +0700
Subject: PR #3233 cleanup

- `::.head` became a `val`; excessive accessor removed
- SerializationProxy moved to `object List`
---
 src/library/scala/collection/immutable/List.scala | 63 +++++++++++------------
 test/files/jvm/t6941/Analyzed_1.scala             |  2 +-
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index 90aabc5a9a..c3728fa02a 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -325,36 +325,7 @@ sealed abstract class List[+A] extends AbstractSeq[A]
 
   // Create a proxy for Java serialization that allows us to avoid mutation
   // during de-serialization.  This is the Serialization Proxy Pattern.
-  protected final def writeReplace(): AnyRef = new SerializationProxy(this)
-}
-
-@SerialVersionUID(1L)
-private class SerializationProxy[B](@transient private var orig: List[B]) extends Serializable {
-
-  private def writeObject(out: ObjectOutputStream) {
-    var xs: List[B] = orig
-    while (!xs.isEmpty) {
-      out.writeObject(xs.head)
-      xs = xs.tail
-    }
-    out.writeObject(ListSerializeEnd)
-  }
-
-  // Java serialization calls this before readResolve during de-serialization.
-  // Read the whole list and store it in `orig`.
-  private def readObject(in: ObjectInputStream) {
-    val builder = List.newBuilder[B]
-    while (true) in.readObject match {
-      case ListSerializeEnd =>
-        orig = builder.result()
-        return
-      case a =>
-        builder += a.asInstanceOf[B]
-    }
-  }
-
-  // Provide the result stored in `orig` for Java serialization
-  private def readResolve(): AnyRef = orig
+  protected final def writeReplace(): AnyRef = new List.SerializationProxy(this)
 }
 
 /** The empty list.
@@ -385,8 +356,7 @@ case object Nil extends List[Nothing] {
  *  @version 1.0, 15/07/2003
  *  @since   2.8
  */
-final case class ::[B](private val hd: B, private[scala] var tl: List[B]) extends List[B] {
-  override def head : B = hd
+final case class ::[B](override val head: B, private[scala] var tl: List[B]) extends List[B] {
   override def tail : List[B] = tl
   override def isEmpty: Boolean = false
 }
@@ -405,6 +375,35 @@ object List extends SeqFactory[List] {
   override def empty[A]: List[A] = Nil
 
   override def apply[A](xs: A*): List[A] = xs.toList
+
+  @SerialVersionUID(1L)
+  private class SerializationProxy[A](@transient private var orig: List[A]) extends Serializable {
+
+    private def writeObject(out: ObjectOutputStream) {
+      var xs: List[A] = orig
+      while (!xs.isEmpty) {
+        out.writeObject(xs.head)
+        xs = xs.tail
+      }
+      out.writeObject(ListSerializeEnd)
+    }
+
+    // Java serialization calls this before readResolve during de-serialization.
+    // Read the whole list and store it in `orig`.
+    private def readObject(in: ObjectInputStream) {
+      val builder = List.newBuilder[A]
+      while (true) in.readObject match {
+        case ListSerializeEnd =>
+          orig = builder.result()
+          return
+        case a =>
+          builder += a.asInstanceOf[A]
+      }
+    }
+
+    // Provide the result stored in `orig` for Java serialization
+    private def readResolve(): AnyRef = orig
+  }
 }
 
 /** Only used for list serialization */
diff --git a/test/files/jvm/t6941/Analyzed_1.scala b/test/files/jvm/t6941/Analyzed_1.scala
index 549abd5e64..b6951f71ee 100644
--- a/test/files/jvm/t6941/Analyzed_1.scala
+++ b/test/files/jvm/t6941/Analyzed_1.scala
@@ -6,6 +6,6 @@ class SameBytecode {
   }
 
   def b(xs: List[Int]) = xs match {
-    case xs: ::[Int] => xs.hd$1
+    case xs: ::[Int] => xs.head
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3