Skip to content

Commit ac7ba71

Browse files
committed
AsyncMacro.macroApplication is gone
1 parent cc47ec1 commit ac7ba71

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/main/scala/scala/async/internal/AsyncMacro.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ object AsyncMacro {
1010
new AsyncMacro { self =>
1111
val c: scala.reflect.macros.Context { val universe: global.type } = c0.asInstanceOf[scala.reflect.macros.Context { val universe: global.type }]
1212
val global: powerContext.universe.type = powerContext.universe
13-
val macroApplication: global.Tree = c0.macroApplication.asInstanceOf[global.Tree]
1413
// This member is required by `AsyncTransform`:
1514
val asyncBase: AsyncBase = base
1615
// These members are required by `ExprBuilder`:
@@ -26,8 +25,7 @@ private[async] trait AsyncMacro
2625

2726
val c: scala.reflect.macros.Context { val universe: global.type }
2827
val global: Global
29-
val macroApplication: global.Tree
3028

31-
lazy val macroPos = macroApplication.pos.makeTransparent
32-
def atMacroPos(t: global.Tree) = global.atPos(macroPos)(t)
29+
lazy val macroPos = c.macroApplication.pos.makeTransparent
30+
def atMacroPos(t: global.Tree) = c.universe.atPos(macroPos)(t)
3331
}

src/main/scala/scala/async/internal/AsyncTransform.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ trait AsyncTransform {
123123
}
124124

125125
AsyncUtils.vprintln(s"In file '$location':")
126-
AsyncUtils.vprintln(s"${macroApplication}")
126+
AsyncUtils.vprintln(s"${c.macroApplication}")
127127
AsyncUtils.vprintln(s"ANF transform expands to:\n $anfTree")
128128
states foreach (s => AsyncUtils.vprintln(s))
129129
}

src/main/scala/scala/async/internal/TransformUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private[async] trait TransformUtils {
8383
}
8484

8585
val NonFatalClass = rootMirror.staticModule("scala.util.control.NonFatal")
86-
val Async_await = asyncBase.awaitMethod(c.universe)(macroApplication.symbol).ensuring(_ != NoSymbol)
86+
val Async_await = asyncBase.awaitMethod(c.universe)(c.macroApplication.symbol).ensuring(_ != NoSymbol)
8787
}
8888

8989
def isSafeToInline(tree: Tree) = {

0 commit comments

Comments
 (0)