Convert TreeUnpickler context functions to CFTs (2)

Author: odersky

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

@@ -705,7 +705,7 @@ class TreeUnpickler(reader: TastyReader,
           case IMPORT =>
             skipTree()
           case PACKAGE =>
-            processPackage { (pid, end) => implicit ctx => indexStats(end) }
+            processPackage { (pid, end) => indexStats(end) }
           case _ =>
             skipTree()
             initsFlags = EmptyFlags
@@ -719,13 +719,13 @@ class TreeUnpickler(reader: TastyReader,
      *   - an end address,
      *   - a context which has the processed package as owner
      */
-    def processPackage[T](op: (RefTree, Addr) => Context => T)(using Context): T = {
+    def processPackage[T](op: (RefTree, Addr) => Context ?=> T)(using Context): T = {
       val sctx = sourceChangeContext()
       if (sctx `ne` ctx) return processPackage(op)(using sctx)
       readByte()
       val end = readEnd()
       val pid = ref(readTermRef()).asInstanceOf[RefTree]
-      op(pid, end)(localContext(pid.symbol.moduleClass))
+      op(pid, end)(using localContext(pid.symbol.moduleClass))
     }
 
     /** Create symbols the longest consecutive sequence of parameters with given
@@ -963,8 +963,7 @@ class TreeUnpickler(reader: TastyReader,
         readImport()
       case PACKAGE =>
         val start = currentAddr
-        processPackage { (pid, end) => ctx =>
-          given Context = ctx
+        processPackage { (pid, end) =>
           setSpan(start, PackageDef(pid, readIndexedStats(exprOwner, end)))
         }
       case _ =>