Skip to content

Commit b69fbd9

Browse files
committed
wip: sling @uncheckedVariance around some more
1 parent 21e7de5 commit b69fbd9

File tree

6 files changed

+90
-86
lines changed

6 files changed

+90
-86
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ trait GenericTraversableTemplate[+A, +CC[X] <: ParIterable[X]] extends HasNewBui
6363

6464
/** The builder that builds instances of type $Coll[A]
6565
*/
66-
protected[this] def newBuilder: Builder[A, CC[A]] = companion.newBuilder[A]
66+
protected[this] def newBuilder: Builder[A @uncheckedVariance, CC[A @uncheckedVariance]] = companion.newBuilder[A]
6767

6868
/** The generic builder that builds instances of $Coll
6969
* at arbitrary element types.

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ package collection
1515
package generic
1616

1717
import mutable.Builder
18+
import scala.annotation.unchecked.uncheckedVariance
1819

1920
trait HasNewBuilder[+A, +Repr] extends Any {
2021
/** The builder that builds instances of Repr */
21-
protected[this] def newBuilder: Builder[A, Repr]
22+
protected[this] def newBuilder: Builder[A @uncheckedVariance, Repr]
2223
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ package collection
1515
package generic
1616

1717
import scala.collection.parallel.Combiner
18+
import scala.annotation.unchecked.uncheckedVariance
1819

1920
trait HasNewCombiner[+T, +Repr] {
20-
protected[this] def newCombiner: Combiner[T, Repr]
21+
protected[this] def newCombiner: Combiner[T @uncheckedVariance, Repr]
2122
}
2223

0 commit comments

Comments
 (0)