wip: sling @uncheckedVariance around some more

Author: SethTisue

core/src/main/scala/scala/collection/generic/GenericTraversableTemplate.scala

@@ -63,7 +63,7 @@ trait GenericTraversableTemplate[+A, +CC[X] <: ParIterable[X]] extends HasNewBui
 
   /** The builder that builds instances of type $Coll[A]
    */
-  protected[this] def newBuilder: Builder[A, CC[A]] = companion.newBuilder[A]
+  protected[this] def newBuilder: Builder[A @uncheckedVariance, CC[A @uncheckedVariance]] = companion.newBuilder[A]
 
   /** The generic builder that builds instances of $Coll
    *  at arbitrary element types.

core/src/main/scala/scala/collection/generic/HasNewBuilder.scala

@@ -15,8 +15,9 @@ package collection
 package generic
 
 import mutable.Builder
+import scala.annotation.unchecked.uncheckedVariance
 
 trait HasNewBuilder[+A, +Repr] extends Any {
   /** The builder that builds instances of Repr */
-  protected[this] def newBuilder: Builder[A, Repr]
+  protected[this] def newBuilder: Builder[A @uncheckedVariance, Repr]
 }

core/src/main/scala/scala/collection/generic/HasNewCombiner.scala

@@ -15,8 +15,9 @@ package collection
 package generic
 
 import scala.collection.parallel.Combiner
+import scala.annotation.unchecked.uncheckedVariance
 
 trait HasNewCombiner[+T, +Repr] {
-  protected[this] def newCombiner: Combiner[T, Repr]
+  protected[this] def newCombiner: Combiner[T @uncheckedVariance, Repr]
 }
 

core/src/main/scala/scala/collection/parallel/ParIterableLike.scala

@@ -20,7 +20,7 @@ import scala.collection.{CustomParallelizable, IterableOps, Parallel}
 import scala.collection.generic._
 import immutable.HashMapCombiner
 import scala.reflect.ClassTag
-
+import scala.annotation.unchecked.uncheckedVariance
 
 /** A template trait for parallel collections of type `ParIterable[T]`.
  *
@@ -145,10 +145,10 @@ import scala.reflect.ClassTag
  *  @define coll parallel iterable
  */
 trait ParIterableLike[+T, +CC[X] <: ParIterable[X], +Repr <: ParIterable[T], +Sequential <: Iterable[T] with IterableOps[T, Iterable, Sequential]]
-extends IterableOnce[T]
-   with CustomParallelizable[T, Repr]
+extends IterableOnce[T @uncheckedVariance]
+   with CustomParallelizable[T @uncheckedVariance, Repr]
    with Parallel
-   with HasNewCombiner[T, Repr]
+   with HasNewCombiner[T @uncheckedVariance, Repr]
 {
 self =>
 
@@ -850,7 +850,7 @@ self =>
   protected trait Accessor[R, Tp]
   extends StrictSplitterCheckTask[R, Tp] {
     protected[this] val pit: IterableSplitter[T]
-    protected[this] def newSubtask(p: IterableSplitter[T]): Accessor[R, Tp]
+    protected[this] def newSubtask(p: IterableSplitter[T @uncheckedVariance]): Accessor[R, Tp]
     def shouldSplitFurther = pit.shouldSplitFurther(self.repr, tasksupport.parallelismLevel)
     def split = pit.splitWithSignalling.map(newSubtask(_)) // default split procedure
     private[parallel] override def signalAbort() = pit.abort()
@@ -919,28 +919,28 @@ self =>
 
   protected trait Transformer[R, Tp] extends Accessor[R, Tp] { }
 
-  protected[this] class Foreach[S](op: T => S, protected[this] val pit: IterableSplitter[T])
+  protected[this] class Foreach[S](op: T => S, protected[this] val pit: IterableSplitter[T @uncheckedVariance])
   extends Accessor[Unit, Foreach[S]] {
     @volatile var result: Unit = ()
     def leaf(prevr: Option[Unit]) = pit.foreach(op)
-    protected[this] def newSubtask(p: IterableSplitter[T]) = new Foreach[S](op, p)
+    protected[this] def newSubtask(p: IterableSplitter[T @uncheckedVariance]) = new Foreach[S](op, p)
   }
 
-  protected[this] class Count(pred: T => Boolean, protected[this] val pit: IterableSplitter[T])
+  protected[this] class Count(pred: T => Boolean, protected[this] val pit: IterableSplitter[T @uncheckedVariance])
   extends Accessor[Int, Count] {
     // val pittxt = pit.toString
     @volatile var result: Int = 0
     def leaf(prevr: Option[Int]) = result = pit.count(pred)
-    protected[this] def newSubtask(p: IterableSplitter[T]) = new Count(pred, p)
+    protected[this] def newSubtask(p: IterableSplitter[T @uncheckedVariance]) = new Count(pred, p)
     override def merge(that: Count) = result = result + that.result
     // override def toString = "CountTask(" + pittxt + ")"
   }
 
-  protected[this] class Reduce[U >: T](op: (U, U) => U, protected[this] val pit: IterableSplitter[T])
+  protected[this] class Reduce[U >: T](op: (U, U) => U, protected[this] val pit: IterableSplitter[T @uncheckedVariance])
   extends Accessor[Option[U], Reduce[U]] {
     @volatile var result: Option[U] = None
     def leaf(prevr: Option[Option[U]]) = if (pit.remaining > 0) result = Some(pit.reduce(op))
-    protected[this] def newSubtask(p: IterableSplitter[T]) = new Reduce(op, p)
+    protected[this] def newSubtask(p: IterableSplitter[T @uncheckedVariance]) = new Reduce(op, p)
     override def merge(that: Reduce[U]) =
       if (this.result == None) result = that.result
       else if (that.result != None) result = Some(op(result.get, that.result.get))