Move quoted.Matcher to scala.internal

Author: nicolasstucki

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

@@ -723,6 +723,12 @@ class Definitions {
     lazy val InternalQuoted_patternHoleR: TermRef = InternalQuotedModule.requiredMethodRef("patternHole")
     def InternalQuoted_patternHole(implicit ctx: Context): Symbol = InternalQuoted_patternHoleR.symbol
 
+  lazy val InternalQuotedMatcherModuleRef: TermRef = ctx.requiredModuleRef("scala.internal.quoted.Matcher")
+    def InternalQuotedMatcherModule(implicit ctx: Context): Symbol = InternalQuotedMatcherModuleRef.symbol
+
+    lazy val InternalQuotedMatcher_unapplyR: TermRef = InternalQuotedMatcherModule.requiredMethodRef(nme.unapply)
+    def InternalQuotedMatcher_unapply(implicit ctx: Context) = InternalQuotedMatcher_unapplyR.symbol
+
   lazy val QuotedExprsModule: TermSymbol = ctx.requiredModule("scala.quoted.Exprs")
   def QuotedExprsClass(implicit ctx: Context): ClassSymbol = QuotedExprsModule.asClass
 
@@ -745,12 +751,6 @@ class Definitions {
   lazy val TastyReflectionModule: TermSymbol = ctx.requiredModule("scala.tasty.Reflection")
     lazy val TastyReflection_macroContext: TermSymbol = TastyReflectionModule.requiredMethod("macroContext")
 
-  lazy val QuotedMatcherModuleRef: TermRef = ctx.requiredModuleRef("scala.runtime.quoted.Matcher")
-  def QuotedMatcherModule(implicit ctx: Context): Symbol = QuotedMatcherModuleRef.symbol
-
-    lazy val QuotedMatcher_unapplyR: TermRef = QuotedMatcherModule.requiredMethodRef(nme.unapply)
-    def QuotedMatcher_unapply(implicit ctx: Context) = QuotedMatcher_unapplyR.symbol
-
   lazy val EqlType: TypeRef = ctx.requiredClassRef("scala.Eql")
   def EqlClass(implicit ctx: Context): ClassSymbol = EqlType.symbol.asClass
   def EqlModule(implicit ctx: Context): Symbol = EqlClass.companionModule

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1944,7 +1944,7 @@ class Typer extends Namer
           val patType = defn.tupleType(splices.tpes.map(_.widen))
           val splicePat = typed(untpd.Tuple(splices.map(untpd.TypedSplice(_))).withSpan(quoted.span), patType)
           UnApply(
-            fun = ref(defn.QuotedMatcher_unapplyR).appliedToType(patType),
+            fun = ref(defn.InternalQuotedMatcher_unapplyR).appliedToType(patType),
             implicits =
               ref(defn.InternalQuoted_exprQuoteR).appliedToType(shape.tpe).appliedTo(shape) ::
               implicitArgTree(defn.TastyReflectionType, tree.span) :: Nil,

library/src-bootstrapped/scala/runtime/quoted/Matcher.scala renamed to library/src-bootstrapped/scala/internal/quoted/Matcher.scala

@@ -1,4 +1,4 @@
-package scala.runtime.quoted
+package scala.internal.quoted
 
 import scala.annotation.internal.sharable
 

library/src-non-bootstrapped/scala/runtime/quoted/Matcher.scala renamed to library/src-non-bootstrapped/scala/internal/quoted/Matcher.scala

@@ -1,7 +1,7 @@
-package scala.runtime.quoted
+package scala.internal.quoted
 
-import scala.quoted._
-import scala.tasty._
+import scala.quoted.Expr
+import scala.tasty.Reflection
 
 object Matcher {
 

tests/run-with-compiler/quote-matcher-runtime/quoted_1.scala

@@ -10,7 +10,7 @@ object Macros {
   private def impl[A, B](a: Expr[A], b: Expr[B])(implicit reflect: Reflection): Expr[Unit] = {
     import reflect._
 
-    val res = scala.runtime.quoted.Matcher.unapply[Tuple](a)(b, reflect).map { tup =>
+    val res = scala.internal.quoted.Matcher.unapply[Tuple](a)(b, reflect).map { tup =>
       tup.toArray.toList.map {
         case r: Expr[_] =>
           s"Expr(${r.unseal.showCode})"

tests/run-with-compiler/quote-matcher-runtime/quoted_2.scala

@@ -1,7 +1,7 @@
 
 import Macros._
 
-import scala.runtime.quoted.Matcher._
+import scala.internal.quoted.Matcher._
 
 import scala.internal.Quoted.patternHole
 

tests/run-with-compiler/quote-matcher-symantics-1/quoted_1.scala

@@ -4,9 +4,6 @@ import scala.quoted.matching._
 
 import scala.tasty.Reflection
 
-import scala.runtime.quoted.Matcher._
-
-import scala.internal.Quoted.patternHole
 
 object Macros {