Skip to content

Commit f2d8842

Browse files
committed
Simplify context handling
- Use only wildcard imports from Contexts - Use `(using Context)` throughout
1 parent 7769a3c commit f2d8842

File tree

110 files changed

+554
-553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+554
-553
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import dotty.tools.dotc.core.Symbols._
1919
import dotty.tools.dotc.transform.Erasure
2020
import dotty.tools.dotc.transform.SymUtils._
2121
import dotty.tools.dotc.util.Spans._
22-
import dotty.tools.dotc.core.Contexts.{inContext, atPhase}
22+
import dotty.tools.dotc.core.Contexts._
2323
import dotty.tools.dotc.core.Phases._
2424
import dotty.tools.dotc.report
2525

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import dotty.tools.dotc.ast.tpd
1313
import dotty.tools.dotc.ast.Trees
1414
import dotty.tools.dotc.core.Annotations._
1515
import dotty.tools.dotc.core.Constants._
16-
import dotty.tools.dotc.core.Contexts.{Context, atPhase}
16+
import dotty.tools.dotc.core.Contexts._
1717
import dotty.tools.dotc.core.Phases._
1818
import dotty.tools.dotc.core.Decorators._
1919
import dotty.tools.dotc.core.Flags._
@@ -927,7 +927,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
927927
throw new RuntimeException(msg)
928928
}
929929

930-
private def compilingArray(using ctx: Context) =
930+
private def compilingArray(using Context) =
931931
ctx.compilationUnit.source.file.name == "Array.scala"
932932
}
933933

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import scala.collection.mutable
88
import scala.collection.generic.Clearable
99

1010
import dotty.tools.dotc.core.Flags._
11-
import dotty.tools.dotc.core.Contexts.{inContext, atPhase}
11+
import dotty.tools.dotc.core.Contexts._
1212
import dotty.tools.dotc.core.Phases._
1313
import dotty.tools.dotc.core.Symbols._
1414
import dotty.tools.dotc.core.Phases.Phase

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools.backend.jvm
22

33
import dotty.tools.dotc.ast.tpd
4-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
4+
import dotty.tools.dotc.core.Contexts._
55
import dotty.tools.dotc.core.Phases._
66
import dotty.tools.dotc.core.Symbols._
77
import dotty.tools.dotc.core.Flags.Trait

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ object DottyBackendInterface {
197197
* True if the current compilation unit is of a primitive class (scala.Boolean et al).
198198
* Used only in assertions.
199199
*/
200-
def isCompilingPrimitive(using ctx: Context) = {
200+
def isCompilingPrimitive(using Context) = {
201201
primitiveCompilationUnits(ctx.compilationUnit.source.file.name)
202202
}
203203

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ object GenBCode {
7575
val name: String = "genBCode"
7676
}
7777

78-
class GenBCodePipeline(val int: DottyBackendInterface)(using ctx: Context) extends BCodeSyncAndTry {
78+
class GenBCodePipeline(val int: DottyBackendInterface)(using Context) extends BCodeSyncAndTry {
7979
import DottyBackendInterface.symExtensions
8080

8181
private var tree: Tree = _

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package backend.jvm
44
import dotc.ast.Trees.Select
55
import dotc.ast.tpd._
66
import dotc.core._
7-
import Contexts.{Context, ctx}
7+
import Contexts._
88
import Names.TermName, StdNames._
99
import Types.{JavaArrayType, UnspecifiedErrorType, Type}
1010
import Symbols.{Symbol, NoSymbol}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools
22
package dotc
33

4-
import core.Contexts.{Context, ctx}
4+
import core.Contexts._
55
import reporting.Reporter
66

77
import scala.annotation.internal.sharable

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools
22
package dotc
33

44
import core._
5-
import Contexts.{Context, ctx}
5+
import Contexts._
66
import SymDenotations.ClassDenotation
77
import Symbols._
88
import util.{FreshNameCreator, SourceFile, NoSource}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.nio.file.{Files, Paths}
55
import dotty.tools.FatalError
66
import config.CompilerCommand
77
import core.Comments.{ContextDoc, ContextDocstrings}
8-
import core.Contexts.{Context, ContextBase, inContext, ctx}
8+
import core.Contexts._
99
import core.{MacroClassLoader, Mode, TypeError}
1010
import core.StdNames.nme
1111
import dotty.tools.dotc.ast.Positioned

0 commit comments

Comments
 (0)