Adapt overrides for Scala 2.13.0-RC3 and 2.13.0 final.

sjrd · sjrd · commit 71435b38a66b · 2019-06-04T16:16:55.000+02:00
Ported from scala/scala#8083 upstream.
diff --git a/scalalib/overrides-2.13/scala/collection/immutable/NumericRange.scala b/scalalib/overrides-2.13/scala/collection/immutable/NumericRange.scala
@@ -54,13 +54,13 @@ sealed class NumericRange[T](
 
   override def iterator: Iterator[T] = new NumericRange.NumericRangeIterator(this, num)
 
-  override def stepper[B >: T, S <: Stepper[_]](implicit shape: StepperShape[B, S]): S with EfficientSplit = {
+  override def stepper[S <: Stepper[_]](implicit shape: StepperShape[T, S]): S with EfficientSplit = {
     import scala.collection.convert._
     import impl._
     val s = shape.shape match {
       case StepperShape.IntShape    => new IntNumericRangeStepper   (this.asInstanceOf[NumericRange[Int]],    0, length)
       case StepperShape.LongShape   => new LongNumericRangeStepper  (this.asInstanceOf[NumericRange[Long]],   0, length)
-      case _         => shape.parUnbox(new AnyNumericRangeStepper[T](this, 0, length).asInstanceOf[AnyStepper[B] with EfficientSplit])
+      case _         => shape.parUnbox(new AnyNumericRangeStepper[T](this, 0, length).asInstanceOf[AnyStepper[T] with EfficientSplit])
     }
     s.asInstanceOf[S with EfficientSplit]
   }
diff --git a/scalalib/overrides-2.13/scala/collection/immutable/Range.scala b/scalalib/overrides-2.13/scala/collection/immutable/Range.scala
@@ -70,7 +70,7 @@ sealed abstract class Range(
 
   final override def iterator: Iterator[Int] = new RangeIterator(start, step, lastElement, isEmpty)
 
-  override final def stepper[B >: Int, S <: Stepper[_]](implicit shape: StepperShape[B, S]): S with EfficientSplit = {
+  override final def stepper[S <: Stepper[_]](implicit shape: StepperShape[Int, S]): S with EfficientSplit = {
     val st = new RangeStepper(start, step, 0, length)
     val r =
       if (shape.shape == StepperShape.IntShape) st

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ sealed class NumericRange[T](`
`54`	`54`
`55`	`55`	`override def iterator: Iterator[T] = new NumericRange.NumericRangeIterator(this, num)`
`56`	`56`
`57`		`- override def stepper[B >: T, S <: Stepper[_]](implicit shape: StepperShape[B, S]): S with EfficientSplit = {`
	`57`	`+ override def stepper[S <: Stepper[_]](implicit shape: StepperShape[T, S]): S with EfficientSplit = {`
`58`	`58`	`import scala.collection.convert._`
`59`	`59`	`import impl._`
`60`	`60`	`val s = shape.shape match {`
`61`	`61`	`case StepperShape.IntShape => new IntNumericRangeStepper (this.asInstanceOf[NumericRange[Int]], 0, length)`
`62`	`62`	`case StepperShape.LongShape => new LongNumericRangeStepper (this.asInstanceOf[NumericRange[Long]], 0, length)`
`63`		`- case _ => shape.parUnbox(new AnyNumericRangeStepper[T](this, 0, length).asInstanceOf[AnyStepper[B] with EfficientSplit])`
	`63`	`+ case _ => shape.parUnbox(new AnyNumericRangeStepper[T](this, 0, length).asInstanceOf[AnyStepper[T] with EfficientSplit])`
`64`	`64`	`}`
`65`	`65`	`s.asInstanceOf[S with EfficientSplit]`
`66`	`66`	`}`