diff options
author | Paul Phillips <paulp@improving.org> | 2011-01-08 08:08:27 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-01-08 08:08:27 +0000 |
commit | d45b5ceed946dbcfb9a852cc7fd25267b6b168a2 (patch) | |
tree | 509d69ec309c6ec84e1e341de61390843a4d6ca8 /src/library | |
parent | 32e7c243272d7aaae6c662aa3e1716dae61e1117 (diff) | |
download | scala-d45b5ceed946dbcfb9a852cc7fd25267b6b168a2.tar.gz scala-d45b5ceed946dbcfb9a852cc7fd25267b6b168a2.tar.bz2 scala-d45b5ceed946dbcfb9a852cc7fd25267b6b168a2.zip |
Override checks and self-types still needed som...
Override checks and self-types still needed some work (ticket #2808.)
I believe this is the right change. The modifications in parallel and
actors were a result of the files failing to compile after the change to
allOverriddenSymbols. (I am taking the position that that aspect is a
feature.) Review by malayeri, odersky.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/parallel/Combiner.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/library/scala/collection/parallel/Combiner.scala b/src/library/scala/collection/parallel/Combiner.scala index 7b133cdbba..4a6ae0cd8f 100644 --- a/src/library/scala/collection/parallel/Combiner.scala +++ b/src/library/scala/collection/parallel/Combiner.scala @@ -22,7 +22,12 @@ trait Combiner[-Elem, +To] extends Builder[Elem, To] with Sizing with Parallel { self: EnvironmentPassingCombiner[Elem, To] => private[collection] final val tasksupport = getTaskSupport - type EPC = EnvironmentPassingCombiner[Elem, To] + // type EPC = EnvironmentPassingCombiner[Elem, To] + // + // [scalacfork] /scratch/trunk2/src/library/scala/collection/parallel/Combiner.scala:25: error: contravariant type Elem occurs in invariant position in type scala.collection.parallel.EnvironmentPassingCombiner[Elem,To] of type EPC + // [scalacfork] type EPC = EnvironmentPassingCombiner[Elem, To] + // [scalacfork] ^ + // [scalacfork] one error found /** Combines the contents of the receiver builder and the `other` builder, * producing a new builder containing both their elements. |