Skip to content

Commit 8da3940

Browse files
committed
Fix deprecation warnings newTermName -> TermName
1 parent b8b9f6b commit 8da3940

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

src/main/scala/scala/async/internal/AsyncBase.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ abstract class AsyncBase {
6464
protected[async] def asyncMethod(u: Universe)(asyncMacroSymbol: u.Symbol): u.Symbol = {
6565
import u._
6666
if (asyncMacroSymbol == null) NoSymbol
67-
else asyncMacroSymbol.owner.typeSignature.member(newTermName("async"))
67+
else asyncMacroSymbol.owner.typeSignature.member(TermName("async"))
6868
}
6969

7070
protected[async] def awaitMethod(u: Universe)(asyncMacroSymbol: u.Symbol): u.Symbol = {
7171
import u._
7272
if (asyncMacroSymbol == null) NoSymbol
73-
else asyncMacroSymbol.owner.typeSignature.member(newTermName("await"))
73+
else asyncMacroSymbol.owner.typeSignature.member(TermName("await"))
7474
}
7575

7676
protected[async] def nullOut(u: Universe)(name: u.Expr[String], v: u.Expr[Any]): u.Expr[Unit] =

src/main/scala/scala/async/internal/AsyncNames.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ final class AsyncNames[U <: Names with Singleton](val u: U) {
4040
}
4141

4242
final class TermNameCache(base: String) extends NameCache[U#TermName](base) {
43-
override protected def newName(s: String): U#TermName = newTermName(s)
43+
override protected def newName(s: String): U#TermName = TermName(s)
4444
}
4545
final class TypeNameCache(base: String) extends NameCache[U#TypeName](base) {
4646
override protected def newName(s: String): U#TypeName = newTypeName(s)
@@ -49,15 +49,15 @@ final class AsyncNames[U <: Names with Singleton](val u: U) {
4949
private val ifRes: TermNameCache = new TermNameCache("if")
5050
private val await: TermNameCache = new TermNameCache("await")
5151

52-
private val result = newTermName("result$async")
53-
private val completed: TermName = newTermName("completed$async")
54-
private val apply = newTermName("apply")
55-
private val stateMachine = newTermName("stateMachine$async")
52+
private val result = TermName("result$async")
53+
private val completed: TermName = TermName("completed$async")
54+
private val apply = TermName("apply")
55+
private val stateMachine = TermName("stateMachine$async")
5656
private val stateMachineT = stateMachine.toTypeName
57-
private val state: u.TermName = newTermName("state$async")
58-
private val execContext = newTermName("execContext$async")
59-
private val tr: u.TermName = newTermName("tr$async")
60-
private val t: u.TermName = newTermName("throwable$async")
57+
private val state: u.TermName = TermName("state$async")
58+
private val execContext = TermName("execContext$async")
59+
private val tr: u.TermName = TermName("tr$async")
60+
private val t: u.TermName = TermName("throwable$async")
6161

6262
final class NameSource[N <: U#Name](cache: NameCache[N]) {
6363
private val count = new AtomicInteger(0)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ trait ExprBuilder {
118118
private def tryGetTree(tryReference: => Tree) =
119119
Assign(
120120
Ident(awaitable.resultName),
121-
TypeApply(Select(futureSystemOps.tryyGet[Any](c.Expr[futureSystem.Tryy[Any]](tryReference)).tree, newTermName("asInstanceOf")), List(TypeTree(awaitable.resultType)))
121+
TypeApply(Select(futureSystemOps.tryyGet[Any](c.Expr[futureSystem.Tryy[Any]](tryReference)).tree, TermName("asInstanceOf")), List(TypeTree(awaitable.resultType)))
122122
)
123123

124124
/* if (tr.isFailure)
@@ -136,7 +136,7 @@ trait ExprBuilder {
136136
Block(toList(futureSystemOps.completeProm[T](
137137
c.Expr[futureSystem.Prom[T]](symLookup.memberRef(name.result)),
138138
c.Expr[futureSystem.Tryy[T]](
139-
TypeApply(Select(tryReference, newTermName("asInstanceOf")),
139+
TypeApply(Select(tryReference, TermName("asInstanceOf")),
140140
List(TypeTree(futureSystemOps.tryType[T]))))).tree),
141141
Return(literalUnit)),
142142
getAndUpdateState

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private[async] trait TransformUtils {
124124
}
125125
private lazy val Boolean_ShortCircuits: Set[Symbol] = {
126126
import definitions.BooleanClass
127-
def BooleanTermMember(name: String) = BooleanClass.typeSignature.member(newTermName(name).encodedName)
127+
def BooleanTermMember(name: String) = BooleanClass.typeSignature.member(TermName(name).encodedName)
128128
val Boolean_&& = BooleanTermMember("&&")
129129
val Boolean_|| = BooleanTermMember("||")
130130
Set(Boolean_&&, Boolean_||)

0 commit comments

Comments
 (0)