Use tpd.Tree directly

Author: nicolasstucki

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

@@ -39,14 +39,14 @@ object PickledQuotes {
 
   /** Transform the expression into its fully spliced Tree */
   def quotedExprToTree[T](expr: quoted.Expr[T])(using Context): Tree = {
-    val expr1 = expr.asInstanceOf[scala.quoted.internal.Expr[Tree]]
+    val expr1 = expr.asInstanceOf[scala.quoted.internal.Expr]
     expr1.checkScopeId(QuoteContextImpl.scopeId)
     changeOwnerOfTree(expr1.tree, ctx.owner)
   }
 
   /** Transform the expression into its fully spliced TypeTree */
   def quotedTypeToTree(tpe: quoted.Type[?])(using Context): Tree = {
-    val tpe1 = tpe.asInstanceOf[scala.quoted.internal.Type[Tree]]
+    val tpe1 = tpe.asInstanceOf[scala.quoted.internal.Type]
     tpe1.checkScopeId(QuoteContextImpl.scopeId)
     changeOwnerOfTree(tpe1.typeTree, ctx.owner)
   }

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

@@ -1003,7 +1003,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
 
     object TypeTree extends TypeTreeModule:
       def of[T <: AnyKind](using tp: scala.quoted.Type[T]): TypeTree =
-        tp.asInstanceOf[scala.quoted.internal.Type[TypeTree]].typeTree
+        tp.asInstanceOf[scala.quoted.internal.Type].typeTree
     end TypeTree
 
     object TypeTreeMethodsImpl extends TypeTreeMethods:
@@ -1572,7 +1572,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
 
     object TypeRepr extends TypeReprModule:
       def of[T <: AnyKind](using tp: scala.quoted.Type[T]): TypeRepr =
-        tp.asInstanceOf[scala.quoted.internal.Type[TypeTree]].typeTree.tpe
+        tp.asInstanceOf[scala.quoted.internal.Type].typeTree.tpe
       def typeConstructorOf(clazz: Class[?]): TypeRepr =
         if (clazz.isPrimitive)
           if (clazz == classOf[Boolean]) dotc.core.Symbols.defn.BooleanType

compiler/src/scala/quoted/internal/Expr.scala

@@ -2,16 +2,18 @@ package scala.quoted.internal
 
 import scala.quoted._
 
+import dotty.tools.dotc.ast.tpd
+
 /** An Expr backed by a tree. Only the current compiler trees are allowed.
  *
  *  These expressions are used for arguments of macros. They contain and actual tree
  *  from the program that is being expanded by the macro.
  *
  *  May contain references to code defined outside this Expr instance.
  */
-final class Expr[Tree](val tree: Tree, val scopeId: Int) extends scala.quoted.Expr[Any] {
+final class Expr(val tree: tpd.Tree, val scopeId: Int) extends scala.quoted.Expr[Any] {
   override def equals(that: Any): Boolean = that match {
-    case that: Expr[_] =>
+    case that: Expr =>
       // Expr are wrappers around trees, therefore they are equals if their trees are equal.
       // All scopeId should be equal unless two different runs of the compiler created the trees.
       tree == that.tree && scopeId == that.scopeId

compiler/src/scala/quoted/internal/Type.scala

@@ -2,10 +2,12 @@ package scala.quoted.internal
 
 import scala.quoted._
 
+import dotty.tools.dotc.ast.tpd
+
 /** Quoted type (or kind) `T` backed by a tree */
-final class Type[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quoted.Type[Any] {
+final class Type(val typeTree: tpd.Tree, val scopeId: Int) extends scala.quoted.Type[?] {
   override def equals(that: Any): Boolean = that match {
-    case that: Type[_] => typeTree ==
+    case that: Type => typeTree ==
       // TastyTreeExpr are wrappers around trees, therfore they are equals if their trees are equal.
       // All scopeId should be equal unless two different runs of the compiler created the trees.
       that.typeTree && scopeId == that.scopeId