Convert TreeUnpickler context functions to CFTs (3)

Author: odersky

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -681,7 +681,7 @@ class TreeUnpickler(reader: TastyReader,
       readByte()
       val end = readEnd()
       val tp = readType()
-      val lazyAnnotTree = readLaterWithOwner(end, rdr => implicit ctx => rdr.readTerm())
+      val lazyAnnotTree = readLaterWithOwner(end, _.readTerm())
       owner =>
         Annotation.deferredSymAndTree(tp.typeSymbol)(lazyAnnotTree(owner).complete)
 
@@ -789,7 +789,7 @@ class TreeUnpickler(reader: TastyReader,
             def complete(using Context) = typer.Inliner.bodyToInline(sym)
           }
         else
-          readLater(end, rdr => implicit ctx => rdr.readTerm())
+          readLater(end, _.readTerm())
 
       def ValDef(tpt: Tree) =
         ta.assignType(untpd.ValDef(sym.name.asTermName, tpt, readRhs(using localCtx)), sym)
@@ -926,7 +926,7 @@ class TreeUnpickler(reader: TastyReader,
       val constr = readIndexedDef().asInstanceOf[DefDef]
       val mappedParents = parents.map(_.changeOwner(localDummy, constr.symbol))
 
-      val lazyStats = readLater(end, rdr => implicit ctx => {
+      val lazyStats = readLater(end, rdr => {
         val stats = rdr.readIndexedStats(localDummy, end)
         tparams ++ vparams ++ stats
       })
@@ -1308,10 +1308,10 @@ class TreeUnpickler(reader: TastyReader,
       setSpan(start, CaseDef(pat, guard, rhs))
     }
 
-    def readLater[T <: AnyRef](end: Addr, op: TreeReader => Context => T)(using Context): Trees.Lazy[T] =
+    def readLater[T <: AnyRef](end: Addr, op: TreeReader => Context ?=> T)(using Context): Trees.Lazy[T] =
       readLaterWithOwner(end, op)(ctx.owner)
 
-    def readLaterWithOwner[T <: AnyRef](end: Addr, op: TreeReader => Context => T)(using Context): Symbol => Trees.Lazy[T] = {
+    def readLaterWithOwner[T <: AnyRef](end: Addr, op: TreeReader => Context ?=> T)(using Context): Symbol => Trees.Lazy[T] = {
       val localReader = fork
       goto(end)
       owner => new LazyReader(localReader, owner, ctx.mode, ctx.source, op)
@@ -1372,10 +1372,10 @@ class TreeUnpickler(reader: TastyReader,
 
   class LazyReader[T <: AnyRef](
       reader: TreeReader, owner: Symbol, mode: Mode, source: SourceFile,
-      op: TreeReader => Context => T) extends Trees.Lazy[T] {
+      op: TreeReader => Context ?=> T) extends Trees.Lazy[T] {
     def complete(using Context): T = {
       pickling.println(i"starting to read at ${reader.reader.currentAddr} with owner $owner")
-      op(reader)(ctx
+      op(reader)(using ctx
         .withPhaseNoLater(picklerPhase)
         .withOwner(owner)
         .withModeBits(mode)