Skip to content

Commit 7fd08df

Browse files
committed
Use result$async as the result field name, and deprecate the old customization hook
1 parent 923b662 commit 7fd08df

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class AsyncNames[U <: Names with Singleton](val u: U) {
3737
private val ifRes: TermNameCache = new TermNameCache("if")
3838
private val await: TermNameCache = new TermNameCache("await")
3939

40-
private val resume = newTermName("resume")
40+
private val result = newTermName("result$async")
4141
private val completed: TermName = newTermName("completed$async")
4242
private val apply = newTermName("apply")
4343
private val stateMachine = newTermName("stateMachine$async")
@@ -57,7 +57,7 @@ final class AsyncNames[U <: Names with Singleton](val u: U) {
5757
final val ifRes = new NameSource[U#TermName](self.matchRes)
5858
final val await = new NameSource[U#TermName](self.await)
5959
final val completed = self.completed
60-
final val result = self.resume
60+
final val result = self.result
6161
final val apply = self.apply
6262
final val stateMachine = self.stateMachine
6363
final val stateMachineT = self.stateMachineT

src/main/scala/scala/async/internal/FutureSystem.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ trait FutureSystem {
8181
@deprecated("No longer honoured by the macro, all generated names now contain $async to avoid accidental clashes with lambda lifted names", "0.9.7")
8282
def freshenAllNames: Boolean = false
8383
def emitTryCatch: Boolean = true
84+
@deprecated("No longer honoured by the macro, all generated names now contain $async to avoid accidental clashes with lambda lifted names", "0.9.7")
8485
def resultFieldName: String = "result"
8586
}
8687

0 commit comments

Comments
 (0)