Skip to content

Commit 5f27160

Browse files
committed
Fix deprecation warnings tpnme -> typeNames
1 parent 5bfc28f commit 5f27160

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ trait ExprBuilder {
9999
Array(nextState)
100100

101101
override def mkHandlerCaseForState[T: WeakTypeTag]: CaseDef = {
102-
val fun = This(tpnme.EMPTY)
102+
val fun = This(typeNames.EMPTY)
103103
val callOnComplete = futureSystemOps.onComplete[Any, Unit](c.Expr[futureSystem.Fut[Any]](awaitable.expr),
104104
c.Expr[futureSystem.Tryy[Any] => Unit](fun), c.Expr[futureSystem.ExecContext](Ident(name.execContext))).tree
105105
val tryGetOrCallOnComplete: List[Tree] =

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ private[async] trait TransformUtils {
214214
*/
215215
private def mapArguments[A](args: List[Tree])(f: (Tree, Int) => (A, Tree)): (List[A], List[Tree]) = {
216216
args match {
217-
case args :+ Typed(tree, Ident(tpnme.WILDCARD_STAR)) =>
217+
case args :+ Typed(tree, Ident(typeNames.WILDCARD_STAR)) =>
218218
val (a, argExprs :+ lastArgExpr) = (args :+ tree).zipWithIndex.map(f.tupled).unzip
219-
val exprs = argExprs :+ atPos(lastArgExpr.pos.makeTransparent)(Typed(lastArgExpr, Ident(tpnme.WILDCARD_STAR)))
219+
val exprs = argExprs :+ atPos(lastArgExpr.pos.makeTransparent)(Typed(lastArgExpr, Ident(typeNames.WILDCARD_STAR)))
220220
(a, exprs)
221221
case args =>
222222
args.zipWithIndex.map(f.tupled).unzip
@@ -253,7 +253,7 @@ private[async] trait TransformUtils {
253253
}
254254

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

@@ -557,8 +557,8 @@ private[async] trait TransformUtils {
557557
val ACCESSOR = (1L << 27).asInstanceOf[FlagSet]
558558
val STABLE = (1L << 22).asInstanceOf[FlagSet]
559559
val field = ValDef(Modifiers(Flag.MUTABLE | Flag.PRIVATE | Flag.LOCAL), name + " ", TypeTree(tpt), init)
560-
val getter = DefDef(Modifiers(ACCESSOR | STABLE), name, Nil, Nil, TypeTree(tpt), Select(This(tpnme.EMPTY), field.name))
561-
val setter = DefDef(Modifiers(ACCESSOR), name + "_=", Nil, List(List(ValDef(NoMods, TermName("x"), TypeTree(tpt), EmptyTree))), TypeTree(definitions.UnitTpe), Assign(Select(This(tpnme.EMPTY), field.name), Ident(TermName("x"))))
560+
val getter = DefDef(Modifiers(ACCESSOR | STABLE), name, Nil, Nil, TypeTree(tpt), Select(This(typeNames.EMPTY), field.name))
561+
val setter = DefDef(Modifiers(ACCESSOR), name + "_=", Nil, List(List(ValDef(NoMods, TermName("x"), TypeTree(tpt), EmptyTree))), TypeTree(definitions.UnitTpe), Assign(Select(This(typeNames.EMPTY), field.name), Ident(TermName("x"))))
562562
field :: getter :: setter :: Nil
563563
} else {
564564
val result = ValDef(NoMods, name, TypeTree(tpt), init)

0 commit comments

Comments
 (0)