diff options
| author | Paul Phillips <paulp@improving.org> | 2011-03-24 05:49:53 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-03-24 05:49:53 +0000 |
| commit | 5670f1f83472eb250a3af7764a9539fbd50558c1 (patch) | |
| tree | 85110a8a4b88ae5d78053f02e8643316551af778 /src/library | |
| parent | 4a6c40fe6b5a1461647fc666c261a8aa542dff06 (diff) | |
| download | scala-5670f1f83472eb250a3af7764a9539fbd50558c1.tar.gz scala-5670f1f83472eb250a3af7764a9539fbd50558c1.tar.bz2 scala-5670f1f83472eb250a3af7764a9539fbd50558c1.zip | |
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.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/CustomParallelizable.scala | 18 | ||||
| -rw-r--r-- | src/library/scala/collection/Parallelizable.scala | 33 |
2 files changed, 19 insertions, 32 deletions
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("") -} - - - - - - - - - - - - - - - |