Discovered Range.foreach inlining was broken du...

Discovered Range.foreach inlining was broken due to a Nothing signature
appearing and confusing the loader. No review.

3 files changed, 20 insertions, 33 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index de1a03cc5c..4eca9f140e 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -264,7 +264,7 @@ abstract class ClassfileParser {
 //            println("Looking for: " + name + ": " + tpe + " inside: " + ownerTpe.typeSymbol + "\n\tand found: " + ownerTpe.members)
           }
         }
-        assert(f != NoSymbol, "could not find " + name + ": " + tpe + "inside: \n" + ownerTpe.members)
+        assert(f != NoSymbol, "could not find\n  " + name + ": " + tpe + "\ninside:\n  " + ownerTpe.members.mkString(", "))
         values(index) = f
       }
       f
diff --git a/src/library/scala/collection/CustomParallelizable.scala b/src/library/scala/collection/CustomParallelizable.scala
new file mode 100644
index 0000000000..3d0b8af2f2
--- /dev/null
+++ b/src/library/scala/collection/CustomParallelizable.scala
@@ -0,0 +1,18 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2011, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+package scala.collection
+
+import parallel.Combiner
+
+trait CustomParallelizable[+A, +ParRepr <: Parallel] extends Parallelizable[A, ParRepr] {
+  self: TraversableOnce[A] =>
+
+  override def par: ParRepr
+  override protected[this] def parCombiner: Combiner[A, ParRepr] = throw new UnsupportedOperationException("")
+}
diff --git a/src/library/scala/collection/Parallelizable.scala b/src/library/scala/collection/Parallelizable.scala
index 207bb25cb6..10ab248626 100644
--- a/src/library/scala/collection/Parallelizable.scala
+++ b/src/library/scala/collection/Parallelizable.scala
@@ -6,16 +6,10 @@
 **                          |/                                          **
 \*                                                                      */
 
-
 package scala.collection
 
-
-
-import parallel.ParIterableLike
 import parallel.Combiner
 
-
-
 /** This trait describes collections which can be turned into parallel collections
  *  by invoking the method `par`. Parallelizable collections may be parametrized with
  *  a target type different than their own.
@@ -24,7 +18,7 @@ import parallel.Combiner
  *  @tparam ParRepr      the actual type of the collection, which has to be parallel
  */
 trait Parallelizable[+A, +ParRepr <: Parallel] {
-self: TraversableOnce[A] =>
+  self: TraversableOnce[A] =>
 
   /** Returns a parallel implementation of this collection.
    *
@@ -53,29 +47,4 @@ self: TraversableOnce[A] =>
    *  @return  a combiner for the parallel collection of type `ParRepr`
    */
   protected[this] def parCombiner: Combiner[A, ParRepr]
-
 }
-
-
-trait CustomParallelizable[+A, +ParRepr <: Parallel] extends Parallelizable[A, ParRepr] {
-self: TraversableOnce[A] =>
-
-  override def par: ParRepr
-
-  protected override def parCombiner = throw new UnsupportedOperationException("")
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-