Fixing the build (toString() issues in the comp...

Fixing the build (toString() issues in the compiler) and the test suite
(toString() issues, spacing issues, and some stringPrefix issues)

3 files changed, 13 insertions, 2 deletions

diff --git a/src/library/scala/List.scala b/src/library/scala/List.scala
index 7e327ef8f0..e34189cd44 100644
--- a/src/library/scala/List.scala
+++ b/src/library/scala/List.scala
@@ -1123,6 +1123,8 @@ sealed abstract class List[+a] extends Seq[a] {
     b.toList
   }
 
+  override protected def stringPrefix = "List"
+
 }
 
 /** The empty list.
diff --git a/src/library/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala
index c2197dc137..5cc6b66874 100644
--- a/src/library/scala/collection/BitSet.scala
+++ b/src/library/scala/collection/BitSet.scala
@@ -160,5 +160,12 @@ abstract class BitSet extends Set[Int] {
    *             This method will implement the Iterbale.toArray behavior in a future release.
    *             Please use <code>underlying</code> to get previous <code>toArray</code> behavior.
    */
-  @deprecated override def toArray[B >: Int]: Array[B] = underlying.asInstanceOf[Array[B]];
+  @deprecated override def toArray[B >: Int]: Array[B] = {
+     val ret0 = underlying
+     val ret1 = new Array[B](ret0.length)
+     for (val i <- 0.until(ret0.length))
+       ret1(i) = (ret0(i) : Any).asInstanceOf[B]
+     ret1
+  }
+  protected override def stringPrefix = "Set";
 }
diff --git a/src/library/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala
index bd0f4d50bd..6bf4d5b626 100644
--- a/src/library/scala/collection/immutable/ListSet.scala
+++ b/src/library/scala/collection/immutable/ListSet.scala
@@ -135,6 +135,8 @@ class ListSet[A] extends AnyRef with Set[A] {
       val tail = ListSet.this - e; new tail.Node(elem)
     }
 
-    override protected def next: ListSet[A] = ListSet.this;
+    override protected def next: ListSet[A] = ListSet.this
+
+    override def stringPrefix = "Set"
   }
 }