summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-02-15 10:05:23 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-02-15 10:05:23 +0000
commitb8a23b072fa0467650be1b56672e0b830d7c8f99 (patch)
tree4601ddaf01c46e7f6a52b623fb51b966e2c0ea0b /src
parenta1309ca93b909f364993dc0c50659792fe744781 (diff)
downloadscala-b8a23b072fa0467650be1b56672e0b830d7c8f99.tar.gz
scala-b8a23b072fa0467650be1b56672e0b830d7c8f99.tar.bz2
scala-b8a23b072fa0467650be1b56672e0b830d7c8f99.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/immutable/HashMap.scala1
-rw-r--r--src/library/scala/collection/immutable/HashSet.scala1
-rw-r--r--src/library/scala/collection/immutable/ListMap.scala2
-rw-r--r--src/library/scala/collection/immutable/TreeMap.scala2
-rw-r--r--src/library/scala/collection/mutable/HashMap.scala1
-rw-r--r--src/library/scala/collection/mutable/HashSet.scala1
-rw-r--r--src/library/scala/collection/mutable/ListMap.scala1
7 files changed, 0 insertions, 9 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