The results of examining many instances of !!! ...

The results of examining many instances of !!! and seeing what I can do
about rendering them less exclamatory. It is not completely out of the
realm of possibility that I have calmed down something which would best
have remained excited, but I am endeavoring to be more "daring" (in the
words of the BAFL.)

16 files changed, 11 insertions, 50 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala
index 8e9f062fa7..3682266a41 100644
--- a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala
+++ b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala
@@ -362,13 +362,8 @@ trait ModelToXML extends ModelExtractor {
         }
       Group(name ++ Text(buf.toString))
     }
-    if (entity.sym.hasFlag(symtab.Flags.CASE)) NodeSeq.Empty;
-    else {
-      val sep = Text("@")
-      val seq = // !!! does it still get confused otherwise?
-      for (attr <- entity.attributes)
-        yield Group({(sep ++ attrFor(attr) ++ <br/>)})
-      seq
-    }
+    def toGroup(x: AnnotationInfo): Node = Group(Text("@") ++ attrFor(x) ++ <br/>)
+    if (entity.sym.hasFlag(symtab.Flags.CASE)) NodeSeq.Empty
+    else NodeSeq fromSeq (entity.attributes map toGroup)
   }
 }
diff --git a/src/dotnet-library/scala/collection/mutable/StringBuilder.scala b/src/dotnet-library/scala/collection/mutable/StringBuilder.scala
index 2a1da07232..ee73e4b1d6 100644
--- a/src/dotnet-library/scala/collection/mutable/StringBuilder.scala
+++ b/src/dotnet-library/scala/collection/mutable/StringBuilder.scala
@@ -851,10 +851,8 @@ final class StringBuilder(initCapacity: Int, private val initValue: String)
 }
 
 
-object StringBuilder {
-
-  type Array[T] = scala.Array[T] // !!!
-
+object StringBuilder
+{
   private val MIN_HIGH_SURROGATE = '\uD800'
   private val MAX_HIGH_SURROGATE = '\uDBFF'
 
diff --git a/src/dotnet-library/scala/util/ClassLoader.scala b/src/dotnet-library/scala/util/ScalaClassLoader.scala
index 0c330e0a14..0c330e0a14 100644
--- a/src/dotnet-library/scala/util/ClassLoader.scala
+++ b/src/dotnet-library/scala/util/ScalaClassLoader.scala
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala
index 3c2cb67094..81903afe82 100644
--- a/src/library/scala/Enumeration.scala
+++ b/src/library/scala/Enumeration.scala
@@ -227,11 +227,7 @@ abstract class Enumeration(initial: Int, names: String*) {
     /** The empty value set */
     val empty = new ValueSet(BitSet.empty)
     /** A value set consisting of given elements */
-    def apply(elems: Value*): ValueSet = {
-      var s = empty
-      for (elem <- elems) s = s + elem // !!! change to s += elem --> error
-      s
-    }
+    def apply(elems: Value*): ValueSet = elems.foldLeft(empty)(_ + _)
     /** A builder object for value sets */
     def newBuilder: Builder[Value, ValueSet] = new AddingBuilder(empty)
     /** The implicit builder for value sets */
diff --git a/src/library/scala/collection/IterableLike.scala b/src/library/scala/collection/IterableLike.scala
index 47a2e77240..cd691bb430 100644
--- a/src/library/scala/collection/IterableLike.scala
+++ b/src/library/scala/collection/IterableLike.scala
@@ -12,8 +12,6 @@ package scala.collection
 import generic._
 import annotation.unchecked.uncheckedVariance
 
-// import immutable.Stream // !!!
-
 /** <p>
  *    A template trait for iterable collections.
  *  </p>
diff --git a/src/library/scala/collection/SortedSet.scala b/src/library/scala/collection/SortedSet.scala
index 635e1f9026..cf2781ab39 100644
--- a/src/library/scala/collection/SortedSet.scala
+++ b/src/library/scala/collection/SortedSet.scala
@@ -7,7 +7,6 @@
 \*                                                                      */
 
 // $Id$
-// !!! todo: integrate in new collections library
 
 package scala.collection
 
diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala
index bf76fa09b3..32b75ad8dc 100644
--- a/src/library/scala/collection/TraversableLike.scala
+++ b/src/library/scala/collection/TraversableLike.scala
@@ -11,9 +11,8 @@
 
 package scala.collection
 import generic._
-import scala.reflect.ClassManifest
 
-// import immutable.{List, Stream, Nil} //!!!
+import scala.reflect.ClassManifest
 import mutable.{Buffer, ArrayBuffer, ListBuffer}
 import annotation.experimental
 
diff --git a/src/library/scala/collection/generic/IterableTemplate.scala b/src/library/scala/collection/generic/IterableTemplate.scala
index 493a16e03d..e628783738 100644
--- a/src/library/scala/collection/generic/IterableTemplate.scala
+++ b/src/library/scala/collection/generic/IterableTemplate.scala
@@ -10,10 +10,6 @@
 
 package scala.collection.generic
 import scala.collection._
-import annotation.unchecked.uncheckedVariance
-
-import scala.util.control.Breaks._
-// import immutable.Stream // !!!
 
 /** <p>
  *    A template trait for iterable collections.
diff --git a/src/library/scala/collection/generic/SortedSetTemplate.scala b/src/library/scala/collection/generic/SortedSetTemplate.scala
index ba058b4276..ffc8f4c39d 100644
--- a/src/library/scala/collection/generic/SortedSetTemplate.scala
+++ b/src/library/scala/collection/generic/SortedSetTemplate.scala
@@ -7,7 +7,6 @@
 \*                                                                      */
 
 // $Id$
-// !!! todo: integrate in new collections library
 
 package scala.collection.generic
 import scala.collection._
diff --git a/src/library/scala/collection/generic/TraversableTemplate.scala b/src/library/scala/collection/generic/TraversableTemplate.scala
index 4e23e5d6ab..df25f5c264 100644
--- a/src/library/scala/collection/generic/TraversableTemplate.scala
+++ b/src/library/scala/collection/generic/TraversableTemplate.scala
@@ -11,11 +11,6 @@
 
 package scala.collection.generic
 import scala.collection._
-import scala.reflect.ClassManifest
-
-// import immutable.{List, Stream, Nil} //!!!
-import mutable.{Buffer, ArrayBuffer, ListBuffer}
-import annotation.experimental
 
 /** <p>
  *    A template trait for traversable collections.
diff --git a/src/library/scala/collection/immutable/Traversable.scala b/src/library/scala/collection/immutable/Traversable.scala
index ed79a87b7a..30699c9589 100644
--- a/src/library/scala/collection/immutable/Traversable.scala
+++ b/src/library/scala/collection/immutable/Traversable.scala
@@ -16,7 +16,6 @@ import scala.collection.mutable
 
 /** A subtrait of <code>collection.Traversable</code> which represents
  *  traversables that cannot be mutated.
- *  !!! todo: revise equality
  *
  *  @author  Matthias Zenger
  *  @author  Martin Odersky
diff --git a/src/library/scala/collection/mutable/GenericArray.scala b/src/library/scala/collection/mutable/GenericArray.scala
index a1a86b2491..43cc03f07a 100644
--- a/src/library/scala/collection/mutable/GenericArray.scala
+++ b/src/library/scala/collection/mutable/GenericArray.scala
@@ -70,8 +70,7 @@ object GenericArray extends SequenceFactory[GenericArray] {
   def newBuilder[A]: Builder[A, GenericArray[A]] =
     new ArrayBuffer[A] mapResult { buf =>
       val result = new GenericArray[A](buf.length)
-      for (i <- 0 until buf.length) result.array(i) = buf(i).asInstanceOf[AnyRef]
-      // !!! todo: replace with    buf.copyToArray(result.array, 0)
+      buf.copyToArray(result.array.asInstanceOf[Array[Any]], 0)
       result
     }
 }
diff --git a/src/library/scala/collection/mutable/StringBuilder.scala b/src/library/scala/collection/mutable/StringBuilder.scala
index a5eab238e5..c65c2d7df1 100644
--- a/src/library/scala/collection/mutable/StringBuilder.scala
+++ b/src/library/scala/collection/mutable/StringBuilder.scala
@@ -843,10 +843,8 @@ final class StringBuilder(initCapacity: Int, private val initValue: String)
 }
 
 
-object StringBuilder {
-
-  type Array[T] = scala.Array[T] // !!!
-
+object StringBuilder
+{
   // method <code>java.util.Arrays.copyOf</code> exists since 1.6
   private def copyOf(src: Array[Char], newLength: Int): Array[Char] = {
     val dest = new Array[Char](newLength)
diff --git a/src/library/scala/runtime/BoxedAnyArray.scala b/src/library/scala/runtime/BoxedAnyArray.scala
index 6ebccdca7d..e0f6bd5be2 100644
--- a/src/library/scala/runtime/BoxedAnyArray.scala
+++ b/src/library/scala/runtime/BoxedAnyArray.scala
@@ -164,14 +164,6 @@ final class BoxedAnyArray[A](val length: Int) extends BoxedArray[A] {
     unboxed
   }
 
-/* !!! todo: deal with array equality
-  override def equals(other: Any): Boolean =
-    other.isInstanceOf[BoxedAnyArray[_]] && (this eq (other.asInstanceOf[BoxedAnyArray[_]])) ||
-    (if (unboxed eq null) boxed == other else unboxed == other)
-
-  override def hashCode(): Int = hash
-*/
-
   def value: AnyRef = {
     if (unboxed eq null) throw new NotDefinedError("BoxedAnyArray.value")
     unboxed
diff --git a/src/library/scala/runtime/RichString.scala b/src/library/scala/runtime/RichString.scala
index 3c643131cc..70addde99a 100644
--- a/src/library/scala/runtime/RichString.scala
+++ b/src/library/scala/runtime/RichString.scala
@@ -209,13 +209,11 @@ class RichString(val self: String) extends Proxy with Vector[Char] with VectorTe
     else
       throw new NumberFormatException("For input string: \"null\"")
 
-  /* !!! causes crash?
   def toArray: Array[Char] = {
     val result = new Array[Char](length)
     self.getChars(0, length, result, 0)
     result
   }
-  */
 
   /** <p>
    *  Uses the underlying string as a pattern (in a fashion similar to
diff --git a/src/library/scala/util/ScalaClassLoader.scala b/src/library/scala/util/ScalaClassLoader.scala
index 56ed6c70c2..3393f0413f 100644
--- a/src/library/scala/util/ScalaClassLoader.scala
+++ b/src/library/scala/util/ScalaClassLoader.scala
@@ -51,7 +51,7 @@ trait ScalaClassLoader extends JavaClassLoader
     if (!Modifier.isStatic(method.getModifiers))
       throw new NoSuchMethodException(objectName + ".main is not static")
 
-    asContext(method.invoke(null, Array(arguments.toArray).toSequence: _*)) // !!! todo: remove toSequence once newarrays starr is in
+    asContext(method.invoke(null, Array(arguments.toArray: AnyRef): _*))  // !!! : AnyRef shouldn't be necessary
   }
 }