Skip to content

Commit 8067622

Browse files
authored
Make Predef capture checked (#24643)
This was forgotten before when we added capture-checked checked stdlib. Maybe it was impossible before due to bootstrap problems? But now it is possible.
1 parent 420f884 commit 8067622

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

library/src/scala/Array.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ object Array {
7777
case _ => it.iterator.toArray[A]
7878
}
7979

80-
private def slowcopy(src : AnyRef,
80+
private def slowcopy(src : AnyRef^,
8181
srcPos : Int,
82-
dest : AnyRef,
82+
dest : AnyRef^,
8383
destPos : Int,
8484
length : Int): Unit = {
8585
var i = srcPos
@@ -107,7 +107,7 @@ object Array {
107107
*
108108
* @see `java.lang.System#arraycopy`
109109
*/
110-
def copy(src: AnyRef, srcPos: Int, dest: AnyRef, destPos: Int, length: Int): Unit = {
110+
def copy(src: AnyRef^, srcPos: Int, dest: AnyRef^, destPos: Int, length: Int): Unit = {
111111
val srcClass = src.getClass
112112
val destClass = dest.getClass
113113
if (srcClass.isArray && ((destClass eq srcClass) ||

library/src/scala/Predef.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
package scala
1414

1515
import scala.language.`2.13`
16+
import language.experimental.captureChecking
1617
import scala.language.implicitConversions
17-
1818
import scala.collection.{mutable, immutable, ArrayOps, StringOps}, immutable.WrappedString
1919
import scala.annotation.{experimental, implicitNotFound, publicInBinary, targetName, nowarn }
2020
import scala.annotation.meta.{ companionClass, companionMethod }
@@ -552,7 +552,7 @@ object Predef extends LowPriorityImplicits {
552552
* `(A => A) <: (A => B)`.
553553
*/
554554
// $ to avoid accidental shadowing (e.g. scala/bug#7788)
555-
implicit def $conforms[A]: A => A = <:<.refl
555+
implicit def $conforms[A]: A -> A = <:<.refl
556556

557557
// Extension methods for working with explicit nulls
558558

0 commit comments

Comments
 (0)