Merge pull request #10360 from dotty-staging/move-scala-internal-to-runtime

Move scala.internal.{MatchCase,TypeBox} to scala.runtime.

Author: smarter

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -843,10 +843,10 @@ class Definitions {
   @tu lazy val EqlClass: ClassSymbol = requiredClass("scala.Eql")
     def Eql_eqlAny(using Context): TermSymbol = EqlClass.companionModule.requiredMethod(nme.eqlAny)
 
-  @tu lazy val TypeBoxClass: ClassSymbol = requiredClass("scala.internal.TypeBox")
+  @tu lazy val TypeBoxClass: ClassSymbol = requiredClass("scala.runtime.TypeBox")
     @tu lazy val TypeBox_CAP: TypeSymbol = TypeBoxClass.requiredType(tpnme.CAP)
 
-  @tu lazy val MatchCaseClass: ClassSymbol = requiredClass("scala.internal.MatchCase")
+  @tu lazy val MatchCaseClass: ClassSymbol = requiredClass("scala.runtime.MatchCase")
   @tu lazy val NotClass: ClassSymbol = requiredClass("scala.util.Not")
     @tu lazy val Not_value: Symbol = NotClass.companionModule.requiredMethod(nme.value)
 

library/src-bootstrapped/scala/runtime/MatchCase.scala

@@ -0,0 +1,5 @@
+package scala.runtime
+
+/** A type constructor for a case in a match type.
+ */
+final abstract class MatchCase[Pat, +Body]

library/src-bootstrapped/scala/runtime/TypeBox.scala

@@ -0,0 +1,11 @@
+package scala.runtime
+
+/** A type for skolems that are generated during capture conversion. Capture conversion
+ *  narrows the type of a tree whose type has wildcard arguments. A typical situation
+ *  is a tree `t` of type `C[_ >: L <: U]` and an expected type `C[X]` where `X` is an
+ *  instantiatable type variable. To be able to instantiate `X`, we cast the tree to type
+ *  `X[$n.CAP]` where `$n` is a fresh skolem type with underlying type `TypeBox[L, U]`.
+ */
+final abstract class TypeBox[-L <: U, +U] {
+  type CAP >: L <: U
+}

library/src/scala/internal/MatchCase.scala renamed to library/src-non-bootstrapped/scala/internal/MatchCase.scala

@@ -1,7 +1,6 @@
 package scala
 import annotation.showAsInfix
 import compiletime._
-import internal._
 
 /** Tuple of arbitrary arity */
 sealed trait Tuple extends Product {

library/src/scala/internal/TypeBox.scala renamed to library/src-non-bootstrapped/scala/internal/TypeBox.scala

@@ -36,7 +36,7 @@ object Macros {
           TypeLambda(
             List("t"),
             _ => List(TypeBounds(TypeRepr.of[Nothing], TypeRepr.of[Any])),
-            tl => TypeRepr.of[scala.internal.MatchCase].appliedTo(List(TypeRepr.of[List].appliedTo(tl.param(0)), tl.param(0)))))
+            tl => TypeRepr.of[scala.runtime.MatchCase].appliedTo(List(TypeRepr.of[List].appliedTo(tl.param(0)), tl.param(0)))))
       )
 
     assert(x1T =:= TypeRepr.of[1])
@@ -53,4 +53,3 @@ object Macros {
     }
   }
 }
-