summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-07-01 20:33:11 +0000
committerPaul Phillips <paulp@improving.org>2010-07-01 20:33:11 +0000
commitc2a3d50262a3e411f67297c5db5ad7e596b4c4f6 (patch)
treeef0ed771cabd3db5ddf1cdc3c685ec0618b19cb4 /src/library
parenta0bacadc80bdf6adc8e0a31d64362082ffb3b142 (diff)
downloadscala-c2a3d50262a3e411f67297c5db5ad7e596b4c4f6.tar.gz
scala-c2a3d50262a3e411f67297c5db5ad7e596b4c4f6.tar.bz2
scala-c2a3d50262a3e411f67297c5db5ad7e596b4c4f6.zip
Renaming files and inserting dummies to please ...
Renaming files and inserting dummies to please ant. Note to committers: whenever there is a source file which does not generate a classfile whose name and path exactly match the name and path of the source file, then ant will recompile the file every time it compiles anything. In this batch there were 7 such files, so any 1-char change meant an 8-file recompile. Someday we'll be rid of ant, but until then... no review.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/generic/CanCombineFrom.scala (renamed from src/library/scala/collection/generic/CanBuildFromParallel.scala)5
-rw-r--r--src/library/scala/collection/generic/ParallelFactory.scala2
-rw-r--r--src/library/scala/collection/parallel/Combiner.scala (renamed from src/library/scala/collection/parallel/Combiners.scala)0
-rw-r--r--src/library/scala/collection/parallel/RemainsIterator.scala (renamed from src/library/scala/collection/parallel/Iterators.scala)5
-rw-r--r--src/library/scala/collection/parallel/Splitter.scala (renamed from src/library/scala/collection/parallel/Splitters.scala)0
-rw-r--r--src/library/scala/collection/parallel/immutable/ParallelIterable.scala.disabled (renamed from src/library/scala/collection/parallel/immutable/ParallelIterable.scala)15
-rw-r--r--src/library/scala/collection/parallel/immutable/ParallelSeq.scala.disabled (renamed from src/library/scala/collection/parallel/immutable/ParallelSeq.scala)11
7 files changed, 11 insertions, 27 deletions
diff --git a/src/library/scala/collection/generic/CanBuildFromParallel.scala b/src/library/scala/collection/generic/CanCombineFrom.scala
index fcbcd6295e..b56dab9794 100644
--- a/src/library/scala/collection/generic/CanBuildFromParallel.scala
+++ b/src/library/scala/collection/generic/CanCombineFrom.scala
@@ -1,13 +1,8 @@
package scala.collection
package generic
-
-
import scala.collection.parallel._
-
-
-
/**
* A base trait for parallel builder factories.
*
diff --git a/src/library/scala/collection/generic/ParallelFactory.scala b/src/library/scala/collection/generic/ParallelFactory.scala
index 0b9e92aa10..fd33631640 100644
--- a/src/library/scala/collection/generic/ParallelFactory.scala
+++ b/src/library/scala/collection/generic/ParallelFactory.scala
@@ -19,7 +19,7 @@ extends TraversableFactory[CC]
type EPC[T, C] = collection.parallel.EnvironmentPassingCombiner[T, C]
/**
- * A generic implementation of the `CanBuildFromParallel` trait, which forwards all calls to
+ * A generic implementation of the `CanCombineFrom` trait, which forwards all calls to
* `apply(from)` to the `genericParallelBuilder` method of the $coll `from`, and calls to `apply()`
* to this factory.
*/
diff --git a/src/library/scala/collection/parallel/Combiners.scala b/src/library/scala/collection/parallel/Combiner.scala
index a37f642d42..a37f642d42 100644
--- a/src/library/scala/collection/parallel/Combiners.scala
+++ b/src/library/scala/collection/parallel/Combiner.scala
diff --git a/src/library/scala/collection/parallel/Iterators.scala b/src/library/scala/collection/parallel/RemainsIterator.scala
index bfebff994c..6ed6d235d2 100644
--- a/src/library/scala/collection/parallel/Iterators.scala
+++ b/src/library/scala/collection/parallel/RemainsIterator.scala
@@ -9,11 +9,6 @@ import scala.collection.generic.CanCombineFrom
import scala.collection.mutable.Builder
import scala.collection.Iterator.empty
-
-
-
-
-
trait RemainsIterator[+T] extends Iterator[T] {
/** The number of elements this iterator has yet to iterate.
* This method doesn't change the state of the iterator.
diff --git a/src/library/scala/collection/parallel/Splitters.scala b/src/library/scala/collection/parallel/Splitter.scala
index b3cad6d67a..b3cad6d67a 100644
--- a/src/library/scala/collection/parallel/Splitters.scala
+++ b/src/library/scala/collection/parallel/Splitter.scala
diff --git a/src/library/scala/collection/parallel/immutable/ParallelIterable.scala b/src/library/scala/collection/parallel/immutable/ParallelIterable.scala.disabled
index 92bf5ab706..25a3217258 100644
--- a/src/library/scala/collection/parallel/immutable/ParallelIterable.scala
+++ b/src/library/scala/collection/parallel/immutable/ParallelIterable.scala.disabled
@@ -7,19 +7,16 @@ import scala.collection.parallel.ParallelIterableLike
import scala.collection.parallel.Combiner
-
-
-
// TODO uncomment when we add parallel vectors
///** A template trait for immutable parallel iterable collections.
-// *
+// *
// * $paralleliterableinfo
-// *
+// *
// * $sideeffects
-// *
+// *
// * @tparam A the element type of the collection
-// *
+// *
// * @author prokopec
// * @since 2.8
// */
@@ -35,9 +32,9 @@ import scala.collection.parallel.Combiner
//object ParallelIterable extends ParallelFactory[ParallelIterable] {
// implicit def canBuildFrom[A]: CanBuildFromParallel[Coll, A, ParallelIterable[A]] =
// new GenericCanBuildFromParallel[A]
-//
+//
// def newBuilder[A]: Combiner[A, ParallelIterable[A]] = null // TODO
-//
+//
// def newCombiner[A]: Combiner[A, ParallelIterable[A]] = null // TODO
//}
diff --git a/src/library/scala/collection/parallel/immutable/ParallelSeq.scala b/src/library/scala/collection/parallel/immutable/ParallelSeq.scala.disabled
index ceb0dcc13d..ddae095f0d 100644
--- a/src/library/scala/collection/parallel/immutable/ParallelSeq.scala
+++ b/src/library/scala/collection/parallel/immutable/ParallelSeq.scala.disabled
@@ -11,13 +11,10 @@ import scala.collection.parallel.Combiner
-
-
-
// TODO uncomment when we add parallel vectors
///** An immutable variant of `ParallelSeq`.
-// *
+// *
// * @define Coll mutable.ParallelSeq
// * @define coll mutable parallel sequence
// */
@@ -27,7 +24,7 @@ import scala.collection.parallel.Combiner
// with GenericParallelTemplate[A, ParallelSeq]
// with ParallelSeqLike[A, ParallelSeq[A], Seq[A]] {
// override def companion: GenericCompanion[ParallelSeq] with GenericParallelCompanion[ParallelSeq] = ParallelSeq
-//
+//
//}
//
//
@@ -37,9 +34,9 @@ import scala.collection.parallel.Combiner
// */
//object ParallelSeq extends ParallelFactory[ParallelSeq] {
// implicit def canBuildFrom[T]: CanBuildFromParallel[Coll, T, ParallelSeq[T]] = new GenericCanBuildFromParallel[T]
-//
+//
// def newBuilder[A]: Combiner[A, ParallelSeq[A]] = null // TODO
-//
+//
// def newCombiner[A]: Combiner[A, ParallelSeq[A]] = null // TODO
//}