Omit redundant (using ctx)

Author: odersky

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -46,10 +46,13 @@ class GenBCode extends Phase {
     myOutput
   }
 
-  def run(using Context): Unit = {
-    new GenBCodePipeline(new DottyBackendInterface(
-      outputDir, superCallsMap.toMap)(using ctx))(using ctx).run(ctx.compilationUnit.tpdTree)
-  }
+  def run(using Context): Unit =
+    new GenBCodePipeline(
+      new DottyBackendInterface(
+        outputDir, superCallsMap.toMap
+      )
+    ).run(ctx.compilationUnit.tpdTree)
+
 
   override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] = {
     try super.runOn(units)

compiler/src/dotty/tools/dotc/Resident.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import core.Contexts.{Context, ctx}
+import core.Contexts.{Context, ctx, inContext}
 import reporting.Reporter
 import java.io.EOFException
 import scala.annotation.tailrec
@@ -41,7 +41,7 @@ class Resident extends Driver {
   final override def process(args: Array[String], rootCtx: Context): Reporter = {
     @tailrec def loop(args: Array[String], prevCtx: Context): Reporter = {
       var (fileNames, ctx) = setup(args, prevCtx)
-      doCompile(residentCompiler, fileNames)(using ctx)
+      inContext(ctx){doCompile(residentCompiler, fileNames)}
       var nextCtx = ctx
       var line = getLine()
       while (line == reset) {

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -1012,7 +1012,7 @@ class Definitions {
     else if (isErased)
       ctx.requiredClass("scala.ErasedFunction" + n.toString)
     else if (n <= MaxImplementedFunctionArity)
-      FunctionClassPerRun()(using ctx)(n)
+      FunctionClassPerRun()(n)
     else
       ctx.requiredClass("scala.Function" + n.toString)
 

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

@@ -285,7 +285,7 @@ object SymbolLoaders {
 
       enterFlatClasses = Some { ctx =>
         enterFlatClasses = None
-        enterClasses(root, packageName, flat = true)(using ctx)
+        inContext(ctx){enterClasses(root, packageName, flat = true)}
       }
       enterClasses(root, packageName, flat = false)
       if (!root.isEmptyPackage)

compiler/src/dotty/tools/dotc/core/TyperState.scala

@@ -113,7 +113,7 @@ class TyperState(private val previous: TyperState /* | Null */) {
         testReporter.inUse = true
         testReporter
       }
-      try op(using ctx)
+      try op
       finally {
         testReporter.inUse = false
         resetConstraintTo(savedConstraint)

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

@@ -964,8 +964,9 @@ class TreeUnpickler(reader: TastyReader,
         readImport()
       case PACKAGE =>
         val start = currentAddr
-        processPackage { (pid, end) => implicit ctx =>
-          setSpan(start, PackageDef(pid, readIndexedStats(exprOwner, end)(using ctx)))
+        processPackage { (pid, end) => ctx =>
+          given Context = ctx
+          setSpan(start, PackageDef(pid, readIndexedStats(exprOwner, end)))
         }
       case _ =>
         readTerm()(using ctx.withOwner(exprOwner))
@@ -1054,7 +1055,7 @@ class TreeUnpickler(reader: TastyReader,
         ConstFold(untpd.Select(qual, name).withType(tpe))
 
       def completeSelect(name: Name, sig: Signature): Select =
-        val qual = readTerm()(using ctx)
+        val qual = readTerm()
         val denot = accessibleDenot(qual.tpe.widenIfUnstable, name, sig)
         makeSelect(qual, name, denot)
 

compiler/src/dotty/tools/dotc/interactive/Interactive.scala

@@ -269,7 +269,7 @@ object Interactive {
     case first :: _ if first eq stat =>
       ctx.exprContext(stat, exprOwner)
     case (imp: Import) :: rest =>
-      contextOfStat(rest, stat, exprOwner, ctx.importContext(imp, imp.symbol(using ctx)))
+      contextOfStat(rest, stat, exprOwner, ctx.importContext(imp, inContext(ctx){imp.symbol}))
     case _ :: rest =>
       contextOfStat(rest, stat, exprOwner, ctx)
   }

compiler/src/dotty/tools/dotc/reporting/Reporter.scala

@@ -146,7 +146,7 @@ trait Reporting { thisCtx: Context =>
     error(msg.mapMsg("Implementation restriction: " + _), pos)
 
   def incompleteInputError(msg: Message, pos: SourcePosition = NoSourcePosition)(using Context): Unit =
-    reporter.incomplete(new Error(msg, pos))(using ctx)
+    reporter.incomplete(new Error(msg, pos))
 
   /** Log msg if settings.log contains the current phase.
    *  See [[config.CompilerCommand#explainAdvanced]] for the exact meaning of

compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

@@ -415,7 +415,7 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
    *  The tests in sbt `types-in-used-names-a`, `types-in-used-names-b`,
    *  `as-seen-from-a` and `as-seen-from-b` rely on this.
    */
-  private abstract class TypeDependencyTraverser(using Context) extends TypeTraverser()(using ctx) {
+  private abstract class TypeDependencyTraverser(using Context) extends TypeTraverser() {
     protected def addDependency(symbol: Symbol): Unit
 
     val seen = new mutable.HashSet[Type]

compiler/src/dotty/tools/dotc/transform/CtxLazy.scala

@@ -16,7 +16,7 @@ class CtxLazy[T](expr: Context ?=> T) {
   private var forced = false
   def apply()(using Context): T = {
     if (!forced) {
-      myValue = expr(using ctx)
+      myValue = expr
       forced = true
     }
     myValue

compiler/src/dotty/tools/dotc/transform/LazyVals.scala

@@ -153,7 +153,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
 
     // val x$lzy = new scala.runtime.LazyInt()
     val holderName = LazyLocalName.fresh(xname)
-    val holderImpl = defn.LazyHolder()(using ctx)(tpe.typeSymbol)
+    val holderImpl = defn.LazyHolder()(tpe.typeSymbol)
     val holderSymbol = ctx.newSymbol(x.symbol.owner, holderName, containerFlags, holderImpl.typeRef, coord = x.span)
     val holderTree = ValDef(holderSymbol, New(holderImpl.typeRef, Nil))