Skip to content

Commit 83756d9

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #114584 - darklyspaced:master, r=cjgillot
E0277 nolonger points at phantom `.await` fixes #113203
2 parents 8a997b1 + 89284af commit 83756d9

File tree

5 files changed

+38
-74
lines changed

5 files changed

+38
-74
lines changed

‎compiler/rustc_parse/src/parser/diagnostics.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1717,13 +1717,7 @@ impl<'a> Parser<'a> {
17171717
self.recover_await_prefix(await_sp)?
17181718
};
17191719
let sp = self.error_on_incorrect_await(lo, hi, &expr, is_question);
1720-
let kind = match expr.kind {
1721-
// Avoid knock-down errors as we don't know whether to interpret this as `foo().await?`
1722-
// or `foo()?.await` (the very reason we went with postfix syntax 😅).
1723-
ExprKind::Try(_) => ExprKind::Err,
1724-
_ => ExprKind::Await(expr, await_sp),
1725-
};
1726-
let expr = self.mk_expr(lo.to(sp), kind);
1720+
let expr = self.mk_expr(lo.to(sp), ExprKind::Err);
17271721
self.maybe_recover_from_bad_qpath(expr)
17281722
}
17291723

‎tests/ui/async-await/await-keyword/incorrect-syntax-suggestions.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,19 @@ async fn foo8() -> Result<(), ()> {
4949
Ok(())
5050
}
5151
fn foo9() -> Result<(), ()> {
52-
let _ = await bar(); //~ ERROR `await` is only allowed inside `async` functions and blocks
53-
//~^ ERROR incorrect use of `await`
52+
let _ = await bar(); //~ ERROR incorrect use of `await`
5453
Ok(())
5554
}
5655
fn foo10() -> Result<(), ()> {
57-
let _ = await? bar(); //~ ERROR `await` is only allowed inside `async` functions and blocks
58-
//~^ ERROR incorrect use of `await`
56+
let _ = await? bar(); //~ ERROR incorrect use of `await`
5957
Ok(())
6058
}
6159
fn foo11() -> Result<(), ()> {
6260
let _ = await bar()?; //~ ERROR incorrect use of `await`
6361
Ok(())
6462
}
6563
fn foo12() -> Result<(), ()> {
66-
let _ = (await bar())?; //~ ERROR `await` is only allowed inside `async` functions and blocks
67-
//~^ ERROR incorrect use of `await`
64+
let _ = (await bar())?; //~ ERROR incorrect use of `await`
6865
Ok(())
6966
}
7067
fn foo13() -> Result<(), ()> {
@@ -111,15 +108,13 @@ async fn foo27() -> Result<(), ()> {
111108
fn foo28() -> Result<(), ()> {
112109
fn foo() -> Result<(), ()> {
113110
let _ = await!(bar())?; //~ ERROR incorrect use of `await`
114-
//~^ ERROR `await` is only allowed inside `async` functions
115111
Ok(())
116112
}
117113
foo()
118114
}
119115
fn foo29() -> Result<(), ()> {
120116
let foo = || {
121117
let _ = await!(bar())?; //~ ERROR incorrect use of `await`
122-
//~^ ERROR `await` is only allowed inside `async` functions
123118
Ok(())
124119
};
125120
foo()

‎tests/ui/async-await/await-keyword/incorrect-syntax-suggestions.stderr

+19-59
Original file line numberDiff line numberDiff line change
@@ -59,75 +59,75 @@ LL | let _ = await bar();
5959
| ^^^^^^^^^^^ help: `await` is a postfix operation: `bar().await`
6060

6161
error: incorrect use of `await`
62-
--> $DIR/incorrect-syntax-suggestions.rs:57:13
62+
--> $DIR/incorrect-syntax-suggestions.rs:56:13
6363
|
6464
LL | let _ = await? bar();
6565
| ^^^^^^^^^^^^ help: `await` is a postfix operation: `bar().await?`
6666

6767
error: incorrect use of `await`
68-
--> $DIR/incorrect-syntax-suggestions.rs:62:13
68+
--> $DIR/incorrect-syntax-suggestions.rs:60:13
6969
|
7070
LL | let _ = await bar()?;
7171
| ^^^^^^^^^^^^ help: `await` is a postfix operation: `bar()?.await`
7272

7373
error: incorrect use of `await`
74-
--> $DIR/incorrect-syntax-suggestions.rs:66:14
74+
--> $DIR/incorrect-syntax-suggestions.rs:64:14
7575
|
7676
LL | let _ = (await bar())?;
7777
| ^^^^^^^^^^^ help: `await` is a postfix operation: `bar().await`
7878

7979
error: incorrect use of `await`
80-
--> $DIR/incorrect-syntax-suggestions.rs:71:24
80+
--> $DIR/incorrect-syntax-suggestions.rs:68:24
8181
|
8282
LL | let _ = bar().await();
8383
| ^^ help: `await` is not a method call, remove the parentheses
8484

8585
error: incorrect use of `await`
86-
--> $DIR/incorrect-syntax-suggestions.rs:76:24
86+
--> $DIR/incorrect-syntax-suggestions.rs:73:24
8787
|
8888
LL | let _ = bar().await()?;
8989
| ^^ help: `await` is not a method call, remove the parentheses
9090

9191
error: incorrect use of `await`
92-
--> $DIR/incorrect-syntax-suggestions.rs:104:13
92+
--> $DIR/incorrect-syntax-suggestions.rs:101:13
9393
|
9494
LL | let _ = await!(bar());
9595
| ^^^^^^^^^^^^^ help: `await` is a postfix operation: `bar().await`
9696

9797
error: incorrect use of `await`
98-
--> $DIR/incorrect-syntax-suggestions.rs:108:13
98+
--> $DIR/incorrect-syntax-suggestions.rs:105:13
9999
|
100100
LL | let _ = await!(bar())?;
101101
| ^^^^^^^^^^^^^ help: `await` is a postfix operation: `bar().await`
102102

103103
error: incorrect use of `await`
104-
--> $DIR/incorrect-syntax-suggestions.rs:113:17
104+
--> $DIR/incorrect-syntax-suggestions.rs:110:17
105105
|
106106
LL | let _ = await!(bar())?;
107107
| ^^^^^^^^^^^^^ help: `await` is a postfix operation: `bar().await`
108108

109109
error: incorrect use of `await`
110-
--> $DIR/incorrect-syntax-suggestions.rs:121:17
110+
--> $DIR/incorrect-syntax-suggestions.rs:117:17
111111
|
112112
LL | let _ = await!(bar())?;
113113
| ^^^^^^^^^^^^^ help: `await` is a postfix operation: `bar().await`
114114

115115
error: expected expression, found `=>`
116-
--> $DIR/incorrect-syntax-suggestions.rs:129:25
116+
--> $DIR/incorrect-syntax-suggestions.rs:124:25
117117
|
118118
LL | match await { await => () }
119119
| ----- ^^ expected expression
120120
| |
121121
| while parsing this incorrect await expression
122122

123123
error: incorrect use of `await`
124-
--> $DIR/incorrect-syntax-suggestions.rs:129:11
124+
--> $DIR/incorrect-syntax-suggestions.rs:124:11
125125
|
126126
LL | match await { await => () }
127127
| ^^^^^^^^^^^^^^^^^^^^^ help: `await` is a postfix operation: `{ await => () }.await`
128128

129129
error: expected one of `.`, `?`, `{`, or an operator, found `}`
130-
--> $DIR/incorrect-syntax-suggestions.rs:132:1
130+
--> $DIR/incorrect-syntax-suggestions.rs:127:1
131131
|
132132
LL | match await { await => () }
133133
| ----- - expected one of `.`, `?`, `{`, or an operator
@@ -138,93 +138,53 @@ LL | }
138138
| ^ unexpected token
139139

140140
error[E0728]: `await` is only allowed inside `async` functions and blocks
141-
--> $DIR/incorrect-syntax-suggestions.rs:52:13
142-
|
143-
LL | fn foo9() -> Result<(), ()> {
144-
| ---- this is not `async`
145-
LL | let _ = await bar();
146-
| ^^^^^ only allowed inside `async` functions and blocks
147-
148-
error[E0728]: `await` is only allowed inside `async` functions and blocks
149-
--> $DIR/incorrect-syntax-suggestions.rs:57:13
150-
|
151-
LL | fn foo10() -> Result<(), ()> {
152-
| ----- this is not `async`
153-
LL | let _ = await? bar();
154-
| ^^^^^ only allowed inside `async` functions and blocks
155-
156-
error[E0728]: `await` is only allowed inside `async` functions and blocks
157-
--> $DIR/incorrect-syntax-suggestions.rs:66:14
158-
|
159-
LL | fn foo12() -> Result<(), ()> {
160-
| ----- this is not `async`
161-
LL | let _ = (await bar())?;
162-
| ^^^^^ only allowed inside `async` functions and blocks
163-
164-
error[E0728]: `await` is only allowed inside `async` functions and blocks
165-
--> $DIR/incorrect-syntax-suggestions.rs:71:19
141+
--> $DIR/incorrect-syntax-suggestions.rs:68:19
166142
|
167143
LL | fn foo13() -> Result<(), ()> {
168144
| ----- this is not `async`
169145
LL | let _ = bar().await();
170146
| ^^^^^ only allowed inside `async` functions and blocks
171147

172148
error[E0728]: `await` is only allowed inside `async` functions and blocks
173-
--> $DIR/incorrect-syntax-suggestions.rs:76:19
149+
--> $DIR/incorrect-syntax-suggestions.rs:73:19
174150
|
175151
LL | fn foo14() -> Result<(), ()> {
176152
| ----- this is not `async`
177153
LL | let _ = bar().await()?;
178154
| ^^^^^ only allowed inside `async` functions and blocks
179155

180156
error[E0728]: `await` is only allowed inside `async` functions and blocks
181-
--> $DIR/incorrect-syntax-suggestions.rs:81:19
157+
--> $DIR/incorrect-syntax-suggestions.rs:78:19
182158
|
183159
LL | fn foo15() -> Result<(), ()> {
184160
| ----- this is not `async`
185161
LL | let _ = bar().await;
186162
| ^^^^^ only allowed inside `async` functions and blocks
187163

188164
error[E0728]: `await` is only allowed inside `async` functions and blocks
189-
--> $DIR/incorrect-syntax-suggestions.rs:85:19
165+
--> $DIR/incorrect-syntax-suggestions.rs:82:19
190166
|
191167
LL | fn foo16() -> Result<(), ()> {
192168
| ----- this is not `async`
193169
LL | let _ = bar().await?;
194170
| ^^^^^ only allowed inside `async` functions and blocks
195171

196172
error[E0728]: `await` is only allowed inside `async` functions and blocks
197-
--> $DIR/incorrect-syntax-suggestions.rs:90:23
173+
--> $DIR/incorrect-syntax-suggestions.rs:87:23
198174
|
199175
LL | fn foo() -> Result<(), ()> {
200176
| --- this is not `async`
201177
LL | let _ = bar().await?;
202178
| ^^^^^ only allowed inside `async` functions and blocks
203179

204180
error[E0728]: `await` is only allowed inside `async` functions and blocks
205-
--> $DIR/incorrect-syntax-suggestions.rs:97:23
181+
--> $DIR/incorrect-syntax-suggestions.rs:94:23
206182
|
207183
LL | let foo = || {
208184
| -- this is not `async`
209185
LL | let _ = bar().await?;
210186
| ^^^^^ only allowed inside `async` functions and blocks
211187

212-
error[E0728]: `await` is only allowed inside `async` functions and blocks
213-
--> $DIR/incorrect-syntax-suggestions.rs:113:17
214-
|
215-
LL | fn foo() -> Result<(), ()> {
216-
| --- this is not `async`
217-
LL | let _ = await!(bar())?;
218-
| ^^^^^ only allowed inside `async` functions and blocks
219-
220-
error[E0728]: `await` is only allowed inside `async` functions and blocks
221-
--> $DIR/incorrect-syntax-suggestions.rs:121:17
222-
|
223-
LL | let foo = || {
224-
| -- this is not `async`
225-
LL | let _ = await!(bar())?;
226-
| ^^^^^ only allowed inside `async` functions and blocks
227-
228-
error: aborting due to 33 previous errors
188+
error: aborting due to 28 previous errors
229189

230190
For more information about this error, try `rustc --explain E0728`.

‎tests/ui/parser/issues/issue-113203.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Checks what happens when we attempt to use the await keyword as a prefix. Span
2+
// incorrectly emitted an `.await` in E0277 which does not exist
3+
// edition:2018
4+
fn main() {
5+
await {}()
6+
//~^ ERROR incorrect use of `await`
7+
}

‎tests/ui/parser/issues/issue-113203.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: incorrect use of `await`
2+
--> $DIR/issue-113203.rs:5:5
3+
|
4+
LL | await {}()
5+
| ^^^^^^^^ help: `await` is a postfix operation: `{}.await`
6+
7+
error: aborting due to previous error
8+

0 commit comments

Comments
 (0)