Simplify unpickleExpr and unpickleType

Author: nicolasstucki

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

@@ -10,15 +10,15 @@ import scala.runtime.quoted.Unpickler._
 
 class QuoteContext private (val tasty: scala.tasty.Reflection) extends scala.quoted.QuoteContext {
 
-  def unpickleExpr[T](pickledExpr: PickledExpr, args: PickledExprArgs): given scala.quoted.QuoteContext => Expr[T] = given qctx => {
+  def unpickleExpr[T](pickledExpr: PickledExpr, args: PickledExprArgs): Expr[T] = {
     new scala.internal.quoted.TastyTreeExpr(
-      PickledQuotes.unpickleExpr(pickledExpr, args) given qctx.tasty.rootContext.asInstanceOf[Context]
+      PickledQuotes.unpickleExpr(pickledExpr, args) given this.tasty.rootContext.asInstanceOf[Context]
     ).asInstanceOf[Expr[T]]
   }
 
-  def unpickleType[T](pickledType: PickledType, args: PickledTypeArgs): given scala.quoted.QuoteContext => Type[T] = given qctx => {
+  def unpickleType[T](pickledType: PickledType, args: PickledTypeArgs): Type[T] = {
     new scala.internal.quoted.TreeType(
-      PickledQuotes.unpickleType(pickledType, args) given qctx.tasty.rootContext.asInstanceOf[Context]
+      PickledQuotes.unpickleType(pickledType, args) given this.tasty.rootContext.asInstanceOf[Context]
     ).asInstanceOf[Type[T]]
   }
 

library/src/scala/quoted/QuoteContext.scala

@@ -53,11 +53,11 @@ trait QuoteContext {
 
   /** Unpickle `pickledExpr` which represents a pickled `Expr` tree
    */
-  private[scala] def unpickleExpr[T](pickledExpr: PickledExpr, args: PickledExprArgs): given QuoteContext => Expr[T]
+  private[scala] def unpickleExpr[T](pickledExpr: PickledExpr, args: PickledExprArgs): Expr[T]
 
   /** Unpickle `pickledType` which represents a pickled `Type` tree
    */
-  private[scala] def unpickleType[T](pickledType: PickledType, args: PickledTypeArgs): given QuoteContext => Type[T]
+  private[scala] def unpickleType[T](pickledType: PickledType, args: PickledTypeArgs): Type[T]
 
 }