Skip to content

Commit 3412f9a

Browse files
oderskyodersky
committed
Convert test classes (2)
1 parent 4947141 commit 3412f9a

10 files changed

+26
-26
lines changed

‎compiler/test/dotty/tools/DottyTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ trait DottyTest extends ContextEscapeDetection {
5454
val lastGroup = allPhases.find(x => x.contains(targetPhase)).get.takeWhile(x => !(x eq targetPhase))
5555
val checker = new Phase {
5656
def phaseName = "assertionChecker"
57-
override def run(implicit ctx: Context): Unit = assertion(ctx.compilationUnit.tpdTree, ctx)
57+
override def run(using Context): Unit = assertion(ctx.compilationUnit.tpdTree, ctx)
5858
}
5959
val lastGroupAppended = List(lastGroup ::: targetPhase :: Nil)
6060

‎compiler/test/dotty/tools/dotc/EntryPointsTest.scala.disabled

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class EntryPointsTest {
5050
private class CustomReporter extends Reporter
5151
with UniqueMessagePositions
5252
with HideNonSensicalMessages {
53-
def doReport(m: Diagnostic)(implicit ctx: Context): Unit = {
53+
def doReport(m: Diagnostic)(using Context): Unit = {
5454
}
5555
}
5656

‎compiler/test/dotty/tools/dotc/ast/DesugarTests.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.junit.Assert._
1111
class DesugarTests extends DottyTest {
1212
import tpd._
1313

14-
private def validSym(sym: Symbol)(implicit ctx: Context): Unit = {
14+
private def validSym(sym: Symbol)(using Context): Unit = {
1515
assert(
1616
// remaining symbols must be either synthetic:
1717
sym.is(Synthetic) ||

‎compiler/test/dotty/tools/dotc/ast/UntypedTreeMapTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class UntpdTreeMapTest extends DottyTest {
2222
def testMapInterpolatedString = {
2323
val tree = parse(""" q"hello ${2017}!" """)
2424
val identity = new UntypedTreeMap {
25-
override def transform(tree: Tree)(implicit ctx: Context): Tree = tree match {
25+
override def transform(tree: Tree)(using Context): Tree = tree match {
2626
case _ => super.transform(tree)
2727
}
2828
}

‎compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class DeSugarTest extends ParserTest {
3131
finally curMode = saved
3232
}
3333

34-
def transform(tree: Tree, mode: Mode)(implicit ctx: Context): Tree = withMode(mode) { transform(tree) }
35-
def transform(trees: List[Tree], mode: Mode)(implicit ctx: Context): List[Tree] = withMode(mode) { transform(trees) }
34+
def transform(tree: Tree, mode: Mode)(using Context): Tree = withMode(mode) { transform(tree) }
35+
def transform(trees: List[Tree], mode: Mode)(using Context): List[Tree] = withMode(mode) { transform(trees) }
3636

37-
override def transform(tree: Tree)(implicit ctx: Context): Tree = {
37+
override def transform(tree: Tree)(using Context): Tree = {
3838
val tree1 = desugar(tree)(using ctx.withModeBits(curMode))
3939
tree1 match {
4040
case TypedSplice(t) =>

‎compiler/test/dotty/tools/dotc/parsing/parsePackage.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object parsePackage extends ParserTest {
1414
var nodes = 0
1515

1616
val transformer = new UntypedTreeMap {
17-
override def transform(tree: Tree)(implicit ctx: Context): Tree = {
17+
override def transform(tree: Tree)(using Context): Tree = {
1818
nodes += 1
1919
tree match {
2020
case Ident(name) =>

‎compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import core.Contexts._
99
class TestMessageLaziness extends DottyTest {
1010
ctx = ctx.fresh.setReporter(new NonchalantReporter)
1111

12-
class NonchalantReporter(implicit ctx: Context) extends Reporter
12+
class NonchalantReporter(using Context) extends Reporter
1313
with UniqueMessagePositions with HideNonSensicalMessages {
14-
def doReport(dia: Diagnostic)(implicit ctx: Context) = ???
14+
def doReport(dia: Diagnostic)(using Context) = ???
1515

16-
override def report(dia: Diagnostic)(implicit ctx: Context) = ()
16+
override def report(dia: Diagnostic)(using Context) = ()
1717
}
1818

1919
case class LazyError() extends Message(ErrorMessageID.LazyErrorId) {

‎compiler/test/dotty/tools/dotc/reporting/TestReporter.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
3333
private var _didCrash = false
3434
final def compilerCrashed: Boolean = _didCrash
3535

36-
protected final def inlineInfo(pos: SourcePosition)(implicit ctx: Context): String =
36+
protected final def inlineInfo(pos: SourcePosition)(using Context): String =
3737
if (pos.exists) {
3838
if (pos.outer.exists)
3939
i"\ninlined at ${pos.outer}:\n" + inlineInfo(pos.outer)
@@ -53,7 +53,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
5353
}
5454

5555
/** Prints the message with the given position indication. */
56-
def printMessageAndPos(dia: Diagnostic, extra: String)(implicit ctx: Context): Unit = {
56+
def printMessageAndPos(dia: Diagnostic, extra: String)(using Context): Unit = {
5757
val msg = messageAndPos(dia.msg, dia.pos, diagnosticLevel(dia))
5858
val extraInfo = inlineInfo(dia.pos)
5959

@@ -66,7 +66,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
6666
if (extraInfo.nonEmpty) _messageBuf.append(extraInfo)
6767
}
6868

69-
override def doReport(dia: Diagnostic)(implicit ctx: Context): Unit = {
69+
override def doReport(dia: Diagnostic)(using Context): Unit = {
7070

7171
// Here we add extra information that we should know about the error message
7272
val extra = dia.msg match {
@@ -125,7 +125,7 @@ object TestReporter {
125125
def simplifiedReporter(writer: PrintWriter): TestReporter = {
126126
val rep = new TestReporter(writer, logPrintln, WARNING) {
127127
/** Prints the message with the given position indication in a simplified manner */
128-
override def printMessageAndPos(dia: Diagnostic, extra: String)(implicit ctx: Context): Unit = {
128+
override def printMessageAndPos(dia: Diagnostic, extra: String)(using Context): Unit = {
129129
def report() = {
130130
val msg = s"${dia.pos.line + 1}: " + dia.msg.kind + extra
131131
val extraInfo = inlineInfo(dia.pos)

‎compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TreeTransformerTest extends DottyTest {
3232
given Context = context
3333
class ConstantTransform extends MiniPhase {
3434

35-
override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = tpd.Literal(Constant(2))
35+
override def transformLiteral(tree: tpd.Literal)(using Context): tpd.Tree = tpd.Literal(Constant(2))
3636
override def phaseName: String = "canReplaceConstant"
3737
init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
3838
}
@@ -50,10 +50,10 @@ class TreeTransformerTest extends DottyTest {
5050
given Context = context
5151
class Transformation extends MiniPhase {
5252

53-
override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = tpd.Literal(Constant(-1))
53+
override def transformLiteral(tree: tpd.Literal)(using Context): tpd.Tree = tpd.Literal(Constant(-1))
5454
override def phaseName: String = "canOverwrite"
5555

56-
override def transformValDef(tree: tpd.ValDef)(implicit ctx: Context): tpd.ValDef = {
56+
override def transformValDef(tree: tpd.ValDef)(using Context): tpd.ValDef = {
5757
Assert.assertTrue("transformation of children succeeded",
5858
tree.rhs.toString == "Literal(Constant(-1))"
5959
)
@@ -77,14 +77,14 @@ class TreeTransformerTest extends DottyTest {
7777
class Transformation1 extends MiniPhase {
7878
override def phaseName: String = "transformationOrder1"
7979

80-
override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = {
80+
override def transformLiteral(tree: tpd.Literal)(using Context): tpd.Tree = {
8181
Assert.assertTrue("correct constant",
8282
tree.const.toString == "Constant(1)"
8383
)
8484
tpd.cpy.Literal(tree)(Constant(-1))
8585
}
8686

87-
override def transformValDef(tree: tpd.ValDef)(implicit ctx: Context): tpd.ValDef = {
87+
override def transformValDef(tree: tpd.ValDef)(using Context): tpd.ValDef = {
8888
Assert.assertTrue("transformation of children succeeded",
8989
tree.rhs.toString == "Literal(Constant(-1))"
9090
)
@@ -95,7 +95,7 @@ class TreeTransformerTest extends DottyTest {
9595
}
9696
class Transformation2 extends MiniPhase {
9797
override def phaseName: String = "transformationOrder2"
98-
override def transformValDef(tree: tpd.ValDef)(implicit ctx: Context): tpd.ValDef = {
98+
override def transformValDef(tree: tpd.ValDef)(using Context): tpd.ValDef = {
9999
Assert.assertTrue("transformation of children succeeded",
100100
tree.rhs.toString == "Literal(Constant(2))"
101101
)
@@ -119,15 +119,15 @@ class TreeTransformerTest extends DottyTest {
119119
var transformed1 = 0
120120
class Transformation1 extends MiniPhase {
121121
override def phaseName: String = "invocationCount1"
122-
override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = {
122+
override def transformLiteral(tree: tpd.Literal)(using Context): tpd.Tree = {
123123
transformed1 += 1
124124
Assert.assertTrue("correct constant",
125125
tree.const.toString == "Constant(1)"
126126
)
127127
tpd.cpy.Literal(tree)(Constant(-1))
128128
}
129129

130-
override def transformValDef(tree: tpd.ValDef)(implicit ctx: Context) = {
130+
override def transformValDef(tree: tpd.ValDef)(using Context) = {
131131
transformed1 += 1
132132
Assert.assertTrue("transformation of children succeeded",
133133
tree.rhs.toString == "Literal(Constant(-3))"
@@ -141,7 +141,7 @@ class TreeTransformerTest extends DottyTest {
141141
class Transformation2 extends MiniPhase {
142142
var constantsSeen = 0
143143
override def phaseName: String = "invocationCount2"
144-
override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = {
144+
override def transformLiteral(tree: tpd.Literal)(using Context): tpd.Tree = {
145145
transformed2 += 1
146146
constantsSeen match {
147147
case 0 =>
@@ -158,7 +158,7 @@ class TreeTransformerTest extends DottyTest {
158158
tpd.cpy.Literal(tree)(Constant(-3))
159159
}
160160

161-
override def transformValDef(tree: tpd.ValDef)(implicit ctx: Context) = {
161+
override def transformValDef(tree: tpd.ValDef)(using Context) = {
162162
transformed2 += 1
163163
Assert.assertTrue("transformation of children succeeded",
164164
tree.rhs.toString == "Literal(Constant(-3))"

‎compiler/test/dotty/tools/vulpix/ParallelTesting.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
467467
private def ntimes(n: Int)(op: Int => Reporter): Reporter =
468468
(1 to n).foldLeft(emptyReporter) ((_, i) => op(i))
469469

470-
override def doCompile(comp: Compiler, files: List[String])(implicit ctx: Context) =
470+
override def doCompile(comp: Compiler, files: List[String])(using Context) =
471471
ntimes(times) { run =>
472472
val start = System.nanoTime()
473473
val rep = super.doCompile(comp, files)

0 commit comments

Comments
 (0)