Remove tpd.Splice.unapply

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -1233,10 +1233,6 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
         else defn.NothingType
       ref(defn.InternalQuoted_exprSplice).appliedToTypes(List(argType, defn.QuoteContextClass.typeRef)).appliedTo(tree)
     }
-    def unapply(tree: Tree)(implicit ctx: Context): Option[Tree] = tree match {
-      case Apply(fn, arg :: Nil) if fn.symbol == defn.InternalQuoted_exprSplice => Some(arg)
-      case _ => None
-    }
   }
 
   /** A key to be used in a context property that tracks enclosing inlined calls */

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

@@ -201,11 +201,11 @@ trait QuotesAndSplices {
       val freshTypeBindingsBuff = new mutable.ListBuffer[Tree]
       val typePatBuf = new mutable.ListBuffer[Tree]
       override def transform(tree: Tree)(implicit ctx: Context) = tree match {
-        case Typed(Splice(pat), tpt) if !tpt.tpe.derivesFrom(defn.RepeatedParamClass) =>
+        case Typed(Apply(fn, pat :: Nil), tpt) if fn.symbol == defn.InternalQuoted_exprSplice && !tpt.tpe.derivesFrom(defn.RepeatedParamClass) =>
           val tpt1 = transform(tpt) // Transform type bindings
           val exprTpt = AppliedTypeTree(TypeTree(defn.QuotedExprClass.typeRef), tpt1 :: Nil)
           transform(Splice(Typed(pat, exprTpt)))
-        case Splice(pat) =>
+        case Apply(fn, pat :: Nil) if fn.symbol == defn.InternalQuoted_exprSplice =>
           try ref(defn.InternalQuoted_patternHole.termRef).appliedToType(tree.tpe).withSpan(tree.span)
           finally {
             val patType = pat.tpe.widen