Skip to content

Commit b8b9f6b

Browse files
committed
Fix deprecation warnings nme -> termNames
1 parent 5f27160 commit b8b9f6b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/main/scala/scala/async/internal/AnfTransform.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private[async] trait AnfTransform {
8181
def statsExprUnit =
8282
stats :+ expr :+ api.typecheck(atPos(expr.pos)(Literal(Constant(()))))
8383
def statsExprThrow =
84-
stats :+ expr :+ api.typecheck(atPos(expr.pos)(Throw(Apply(Select(New(gen.mkAttributedRef(defn.IllegalStateExceptionClass)), nme.CONSTRUCTOR), Nil))))
84+
stats :+ expr :+ api.typecheck(atPos(expr.pos)(Throw(Apply(Select(New(gen.mkAttributedRef(defn.IllegalStateExceptionClass)), termNames.CONSTRUCTOR), Nil))))
8585
expr match {
8686
case Apply(fun, args) if isAwait(fun) =>
8787
val valDef = defineVal(name.await(), expr, tree.pos)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ trait AsyncTransform {
112112

113113
Block(List[Tree](
114114
stateMachineSpliced,
115-
ValDef(NoMods, name.stateMachine, TypeTree(), Apply(Select(New(Ident(stateMachine.symbol)), nme.CONSTRUCTOR), Nil)),
115+
ValDef(NoMods, name.stateMachine, TypeTree(), Apply(Select(New(Ident(stateMachine.symbol)), termNames.CONSTRUCTOR), Nil)),
116116
futureSystemOps.spawn(Apply(selectStateMachine(name.apply), Nil), selectStateMachine(name.execContext))
117117
),
118118
futureSystemOps.promiseToFuture(c.Expr[futureSystem.Prom[T]](selectStateMachine(name.result))).tree)
@@ -205,7 +205,7 @@ trait AsyncTransform {
205205
atPos(tree.pos) {
206206
gen.mkAttributedStableRef(thisType(fieldSym.owner.asClass), fieldSym).setType(tree.tpe)
207207
}
208-
case sel @ Select(n@New(tt: TypeTree), nme.CONSTRUCTOR) =>
208+
case sel @ Select(n@New(tt: TypeTree), termNamesCONSTRUCTOR) =>
209209
adjustType(sel)
210210
adjustType(n)
211211
adjustType(tt)

src/main/scala/scala/async/internal/ExprBuilder.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,14 +523,14 @@ trait ExprBuilder {
523523
private def resumeFunTree[T: WeakTypeTag]: Tree = {
524524
val stateMemberSymbol = symLookup.stateMachineMember(name.state)
525525
val stateMemberRef = symLookup.memberRef(name.state)
526-
val body = Match(stateMemberRef, mkCombinedHandlerCases[T] ++ initStates.flatMap(_.mkOnCompleteHandler[T]) ++ List(CaseDef(Ident(nme.WILDCARD), EmptyTree, Throw(Apply(Select(New(Ident(defn.IllegalStateExceptionClass)), termNames.CONSTRUCTOR), List())))))
526+
val body = Match(stateMemberRef, mkCombinedHandlerCases[T] ++ initStates.flatMap(_.mkOnCompleteHandler[T]) ++ List(CaseDef(Ident(termNames.WILDCARD), EmptyTree, Throw(Apply(Select(New(Ident(defn.IllegalStateExceptionClass)), termNames.CONSTRUCTOR), List())))))
527527
val body1 = compactStates(body)
528528

529529
maybeTry(
530530
body1,
531531
List(
532532
CaseDef(
533-
Bind(name.t, Typed(Ident(nme.WILDCARD), Ident(defn.ThrowableClass))),
533+
Bind(name.t, Typed(Ident(termNames.WILDCARD), Ident(defn.ThrowableClass))),
534534
EmptyTree, {
535535
val then = {
536536
val t = c.Expr[Throwable](Ident(name.t))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ private[async] trait TransformUtils {
253253
}
254254

255255
def emptyConstructor: DefDef = {
256-
val emptySuperCall = Apply(Select(Super(This(typeNames.EMPTY), typeNames.EMPTY), nme.CONSTRUCTOR), Nil)
257-
DefDef(NoMods, nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(emptySuperCall), Literal(Constant(()))))
256+
val emptySuperCall = Apply(Select(Super(This(typeNames.EMPTY), typeNames.EMPTY), termNames.CONSTRUCTOR), Nil)
257+
DefDef(NoMods, termNames.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(emptySuperCall), Literal(Constant(()))))
258258
}
259259

260260
def applied(className: String, types: List[Type]): AppliedTypeTree =

0 commit comments

Comments
 (0)