Skip to content

Commit 5dc26f5

Browse files
committed
Move the JUnitBootstrappers phase to transform.sjs.
Since it is in fact a transformation, not a back-end thing.
1 parent 2085001 commit 5dc26f5

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Compiler {
122122
new ExpandPrivate, // Widen private definitions accessed from nested classes
123123
new RestoreScopes, // Repair scopes rendered invalid by moving definitions in prior phases of the group
124124
new SelectStatic, // get rid of selects that would be compiled into GetStatic
125-
new backend.sjs.JUnitBootstrappers, // Generate JUnit-specific bootstrapper classes for Scala.js (not enabled by default)
125+
new sjs.JUnitBootstrappers, // Generate JUnit-specific bootstrapper classes for Scala.js (not enabled by default)
126126
new CollectSuperCalls) :: // Find classes that are called with super
127127
Nil
128128

compiler/src/dotty/tools/backend/sjs/JUnitBootstrappers.scala renamed to compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package dotty.tools.backend.sjs
1+
package dotty.tools.dotc
2+
package transform
3+
package sjs
24

35
import scala.annotation.tailrec
46

5-
import dotty.tools.dotc._
6-
77
import dotty.tools.dotc.core._
88
import Constants._
99
import Contexts._
@@ -19,6 +19,8 @@ import Types._
1919

2020
import dotty.tools.dotc.transform.MegaPhase._
2121

22+
import dotty.tools.backend.sjs.JSDefinitions.jsdefn
23+
2224
/** Generates JUnit bootstrapper objects for Scala.js.
2325
*
2426
* On the JVM, JUnit uses run-time reflection to list and invoke JUnit-related
@@ -108,7 +110,6 @@ import dotty.tools.dotc.transform.MegaPhase._
108110
class JUnitBootstrappers extends MiniPhase {
109111
import JUnitBootstrappers._
110112
import ast.tpd._
111-
import JSDefinitions.jsdefn
112113

113114
def phaseName: String = "junitBootstrappers"
114115

0 commit comments

Comments
 (0)