Revert "Added missing string prefixes for names...

Revert "Added missing string prefixes for names of map and set
collection classes." and related commits.

No review.

9 files changed, 17 insertions, 26 deletions

diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala
index 722949779c..e0f15f67da 100644
--- a/src/library/scala/collection/immutable/HashMap.scala
+++ b/src/library/scala/collection/immutable/HashMap.scala
@@ -93,7 +93,6 @@ class HashMap[A, +B] extends Map[A,B] with MapLike[A, B, HashMap[A, B]] with Par
 
   private type C = (A, B)
   override def toParMap[D, E](implicit ev: C <:< (D, E)) = par.asInstanceOf[ParHashMap[D, E]]
-  override def stringPrefix: String = "HashMap"
 }
 
 /** $factoryInfo
diff --git a/src/library/scala/collection/immutable/HashSet.scala b/src/library/scala/collection/immutable/HashSet.scala
index d2439584c3..c47186b27b 100644
--- a/src/library/scala/collection/immutable/HashSet.scala
+++ b/src/library/scala/collection/immutable/HashSet.scala
@@ -81,7 +81,6 @@ class HashSet[A] extends Set[A]
   protected def writeReplace(): AnyRef = new HashSet.SerializationProxy(this)
   override def toParIterable = par
   override def toParSet[B >: A] = par.asInstanceOf[ParHashSet[B]]
-  override def stringPrefix: String = "HashSet"
 }
 
 /** $factoryInfo
diff --git a/src/library/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala
index f86833c9ce..660e78040e 100644
--- a/src/library/scala/collection/immutable/ListMap.scala
+++ b/src/library/scala/collection/immutable/ListMap.scala
@@ -123,8 +123,6 @@ class ListMap[A, +B] extends Map[A, B] with MapLike[A, B, ListMap[A, B]] with Se
   protected def value: B = throw new NoSuchElementException("empty map")
   protected def next: ListMap[A, B] = throw new NoSuchElementException("empty map")
 
-  override def stringPrefix: String = "ListMap"
-
   /** This class represents an entry in the `ListMap`.
    */
   @SerialVersionUID(-6453056603889598734L)
diff --git a/src/library/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala
index f1d80cfa14..5543e1cba3 100644
--- a/src/library/scala/collection/immutable/TreeMap.scala
+++ b/src/library/scala/collection/immutable/TreeMap.scala
@@ -152,8 +152,6 @@ class TreeMap[A, +B](override val size: Int, t: RedBlack[A]#Tree[B])(implicit va
   override def toStream: Stream[(A, B)] = tree.toStream
 
   override def foreach[U](f : ((A,B)) =>  U) = tree foreach { case (x, y) => f(x, y) }
-
-  override def stringPrefix: String = "TreeMap"
 }
 
 
diff --git a/src/library/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala
index 4467fbf258..c1b4e50021 100644
--- a/src/library/scala/collection/mutable/HashMap.scala
+++ b/src/library/scala/collection/mutable/HashMap.scala
@@ -135,7 +135,6 @@ extends Map[A, B]
   private type C = (A, B)
   override def toParMap[D, E](implicit ev: C <:< (D, E)) = par.asInstanceOf[ParHashMap[D, E]]
 
-  override def stringPrefix: String = "HashMap"
 }
 
 /** $factoryInfo
diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala
index 948daf9fee..a1b85fa16e 100644
--- a/src/library/scala/collection/mutable/HashSet.scala
+++ b/src/library/scala/collection/mutable/HashSet.scala
@@ -97,7 +97,6 @@ extends Set[A]
 
   override def toParSet[B >: A] = par.asInstanceOf[ParHashSet[B]]
 
-  override def stringPrefix: String = "HashSet"
 }
 
 /** $factoryInfo
diff --git a/src/library/scala/collection/mutable/ListMap.scala b/src/library/scala/collection/mutable/ListMap.scala
index 52326289f0..37baea60c2 100644
--- a/src/library/scala/collection/mutable/ListMap.scala
+++ b/src/library/scala/collection/mutable/ListMap.scala
@@ -54,7 +54,6 @@ class ListMap[A, B] extends Map[A, B] with MapLike[A, B, ListMap[A, B]] with Ser
 
   override def clear() = { elems = List(); siz = 0 }
   override def size: Int = siz
-  override def stringPrefix: String = "ListMap"
 }
 
 /** $factoryInfo
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index ae7cc2d88d..0717de2a8e 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -77,20 +77,20 @@ x = BitSet(2, 3)
 y = BitSet(2, 3)
 x equals y: true, y equals x: true
 
-x = HashMap(1 -> A, 2 -> B, 3 -> C)
-y = HashMap(1 -> A, 2 -> B, 3 -> C)
+x = Map(1 -> A, 2 -> B, 3 -> C)
+y = Map(1 -> A, 2 -> B, 3 -> C)
 x equals y: true, y equals x: true
 
-x = HashSet(1, 2)
-y = HashSet(1, 2)
+x = Set(1, 2)
+y = Set(1, 2)
 x equals y: true, y equals x: true
 
 x = List((buffers,20), (layers,2), (title,3))
 y = List((buffers,20), (layers,2), (title,3))
 x equals y: true, y equals x: true
 
-x = ListMap(buffers -> 20, layers -> 2, title -> 3)
-y = ListMap(buffers -> 20, layers -> 2, title -> 3)
+x = Map(buffers -> 20, layers -> 2, title -> 3)
+y = Map(buffers -> 20, layers -> 2, title -> 3)
 x equals y: true, y equals x: true
 
 x = ListSet(5, 3)
@@ -109,8 +109,8 @@ x = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
 y = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
 x equals y: true, y equals x: true
 
-x = TreeMap(1 -> A, 2 -> B, 3 -> C)
-y = TreeMap(1 -> A, 2 -> B, 3 -> C)
+x = Map(1 -> A, 2 -> B, 3 -> C)
+y = Map(1 -> A, 2 -> B, 3 -> C)
 x equals y: true, y equals x: true
 
 x = TreeSet(1, 2, 3)
@@ -125,8 +125,8 @@ x = Stream(0, ?)
 y = Stream(0, ?)
 x equals y: true, y equals x: true
 
-x = TreeMap(42 -> FortyTwo)
-y = TreeMap(42 -> FortyTwo)
+x = Map(42 -> FortyTwo)
+y = Map(42 -> FortyTwo)
 x equals y: true, y equals x: true
 
 x = TreeSet(0, 2)
@@ -161,12 +161,12 @@ x = BitSet(0, 8, 9)
 y = BitSet(0, 8, 9)
 x equals y: true, y equals x: true
 
-x = HashMap(C -> 3, B -> 2, A -> 1)
-y = HashMap(C -> 3, A -> 1, B -> 2)
+x = Map(C -> 3, B -> 2, A -> 1)
+y = Map(C -> 3, A -> 1, B -> 2)
 x equals y: true, y equals x: true
 
-x = HashSet(layers, title, buffers)
-y = HashSet(layers, title, buffers)
+x = Set(layers, title, buffers)
+y = Set(layers, title, buffers)
 x equals y: true, y equals x: true
 
 x = History()
diff --git a/test/files/run/bug1074.check b/test/files/run/bug1074.check
index def79b6089..ccf1cb1551 100644
--- a/test/files/run/bug1074.check
+++ b/test/files/run/bug1074.check
@@ -1,3 +1,3 @@
-q0 = HashSet(kl, jk, cd, fg, ef, gh, a, de, hj, b, lm, mn)
-q1 = HashSet() 0
-q2 = HashSet() 0
+q0 = Set(kl, jk, cd, fg, ef, gh, a, de, hj, b, lm, mn)
+q1 = Set() 0
+q2 = Set() 0