Simplify uses of QuoteContextInternal

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/Matcher.scala

@@ -97,7 +97,7 @@ import scala.quoted._
  */
 object Matcher {
 
-  abstract class QuoteMatcher[QCtx <: QuoteContext & scala.internal.quoted.QuoteContextInternal & Singleton](val qctx: QCtx) {
+  abstract class QuoteMatcher[QCtx <: QuoteContext & Singleton](val qctx: QCtx) {
 
     // TODO improve performance
 

compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala

@@ -2670,7 +2670,6 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
         ctx1
 
     val qctx1 = dotty.tools.dotc.quoted.QuoteContextImpl()(using ctx1)
-      .asInstanceOf[QuoteContext & scala.internal.quoted.QuoteContextInternal]
 
     val matcher = new Matcher.QuoteMatcher[qctx1.type](qctx1) {
       def patternHoleSymbol: qctx1.reflect.Symbol = dotc.core.Symbols.defn.InternalQuotedPatterns_patternHole.asInstanceOf

library/src-bootstrapped/scala/internal/quoted/Expr.scala

@@ -1,7 +1,6 @@
 package scala.internal.quoted
 
 import scala.quoted._
-import scala.internal.quoted.QuoteContextInternal.quoteContextWithQuoteContextInternal
 
 /** An Expr backed by a tree. Only the current compiler trees are allowed.
  *
@@ -53,8 +52,7 @@ object Expr {
    */
   def unapply[TypeBindings <: Tuple, Tup <: Tuple](scrutineeExpr: scala.quoted.Expr[Any])
         (using patternExpr: scala.quoted.Expr[Any], qctx: QuoteContext): Option[Tup] = {
-    val qctx1 = quoteContextWithQuoteContextInternal(qctx)
-    qctx1.exprMatch(scrutineeExpr, patternExpr).asInstanceOf[Option[Tup]]
+    qctx.asInstanceOf[QuoteContextInternal].exprMatch(scrutineeExpr, patternExpr).asInstanceOf[Option[Tup]]
   }
 
   /** Returns a null expresssion equivalent to `'{null}` */

library/src-bootstrapped/scala/internal/quoted/Type.scala

@@ -1,7 +1,6 @@
 package scala.internal.quoted
 
 import scala.quoted._
-import scala.internal.quoted.QuoteContextInternal.quoteContextWithQuoteContextInternal
 
 /** Quoted type (or kind) `T` backed by a tree */
 final class Type[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quoted.Type[Any] {
@@ -36,8 +35,7 @@ object Type {
    */
   def unapply[TypeBindings <: Tuple, Tup <: Tuple](scrutineeType: scala.quoted.Type[_])
       (using patternType: scala.quoted.Type[_], qctx: QuoteContext): Option[Tup] = {
-    val qctx1 = quoteContextWithQuoteContextInternal(qctx)
-    qctx1.typeMatch(scrutineeType, patternType).asInstanceOf[Option[Tup]]
+    qctx.asInstanceOf[QuoteContextInternal].typeMatch(scrutineeType, patternType).asInstanceOf[Option[Tup]]
   }
 
 

library/src/scala/internal/quoted/PickledQuote.scala

@@ -17,12 +17,10 @@ trait PickledQuote:
 object PickledQuote:
 
   def unpickleExpr[T](pickledQuote: PickledQuote): QuoteContext ?=> Expr[T] =
-    val qctx = QuoteContextInternal.quoteContextWithQuoteContextInternal(summon[QuoteContext])
-    qctx.unpickleExpr(pickledQuote).asInstanceOf[Expr[T]]
+    qctx.asInstanceOf[QuoteContextInternal].unpickleExpr(pickledQuote).asInstanceOf[Expr[T]]
 
   def unpickleType[T](pickledQuote: PickledQuote): QuoteContext ?=> Type[T] =
-    val qctx = QuoteContextInternal.quoteContextWithQuoteContextInternal(summon[QuoteContext])
-    qctx.unpickleType(pickledQuote).asInstanceOf[Type[T]]
+    qctx.asInstanceOf[QuoteContextInternal].unpickleType(pickledQuote).asInstanceOf[Type[T]]
 
   /** Create an instance of PickledExpr from encoded tasty and sequence of labmdas to fill holes
    *

library/src/scala/internal/quoted/QuoteContextInternal.scala

@@ -7,8 +7,6 @@ import scala.internal.quoted.PickledQuote
 /** Part of the QuoteContext interface that needs to be implemented by the compiler but is not visible to users */
 trait QuoteContextInternal { self: scala.quoted.QuoteContext =>
 
-  import self.reflect._
-
   /** Unpickle `repr` which represents a pickled `Expr` tree,
    *  replacing splice nodes with `holes`
    */
@@ -50,11 +48,3 @@ trait QuoteContextInternal { self: scala.quoted.QuoteContext =>
   def typeMatch(scrutinee: scala.quoted.Type[?], pattern: scala.quoted.Type[?]): Option[Tuple]
 
 }
-
-
-object QuoteContextInternal {
-
-  private[scala] def quoteContextWithQuoteContextInternal(qctx: QuoteContext): qctx.type { val reflect: qctx.reflect.type } & QuoteContextInternal =
-    qctx.asInstanceOf[qctx.type { val reflect: qctx.reflect.type } & QuoteContextInternal]
-
-}