Skip to content

Avoid stale closure recovery state across statements #160008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 2 commits into from
Jul 28, 2026
+58 −0
Merged

Avoid stale closure recovery state across statements #160008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f8e276
add regression test for stale closure recovery state
TaKO8Ki Jul 27, 2026
da2697d
reset closure recovery state before parsing a statement
TaKO8Ki Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/rustc_parse/src/parser/stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ impl<'a> Parser<'a> {
force_collect: ForceCollect,
force_full_expr: bool,
) -> PResult<'a, Stmt> {
self.current_closure.take();

let pre_attr_pos = self.collect_pos();
let attrs = self.parse_outer_attributes()?;
let lo = self.token.span;
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/expr/malformed_closure/missing-braces-before-close-brace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Regression test for https://github.com/rust-lang/rust/issues/159989

fn main() {
for<> || -> () {};
//~^ ERROR `for<...>` binders for closures are experimental
for<'a> || -> () |_;
//~^ ERROR expected one of `,`, `:`, or `|`, found `;`
//~| ERROR expected one of `,`, `:`, or `|`, found `;`
//~| ERROR expected `{`, found `|`
//~| ERROR `for<...>` binders for closures are experimental
}
45 changes: 45 additions & 0 deletions tests/ui/expr/malformed_closure/missing-braces-before-close-brace.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
error: expected one of `,`, `:`, or `|`, found `;`
--> $DIR/missing-braces-before-close-brace.rs:6:24
|
LL | for<'a> || -> () |_;
| ^ expected one of `,`, `:`, or `|`

error: expected one of `,`, `:`, or `|`, found `;`
--> $DIR/missing-braces-before-close-brace.rs:6:24
|
LL | for<'a> || -> () |_;
| ^ expected one of `,`, `:`, or `|`
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: expected `{`, found `|`
--> $DIR/missing-braces-before-close-brace.rs:6:22
|
LL | for<'a> || -> () |_;
| ^ expected `{`

error[E0658]: `for<...>` binders for closures are experimental
--> $DIR/missing-braces-before-close-brace.rs:4:5
|
LL | for<> || -> () {};
| ^^^^^
|
= note: see issue #97362 <https://github.com/rust-lang/rust/issues/97362> for more information
= help: add `#![feature(closure_lifetime_binder)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: consider removing `for<...>`

error[E0658]: `for<...>` binders for closures are experimental
--> $DIR/missing-braces-before-close-brace.rs:6:5
|
LL | for<'a> || -> () |_;
| ^^^^^^^
|
= note: see issue #97362 <https://github.com/rust-lang/rust/issues/97362> for more information
= help: add `#![feature(closure_lifetime_binder)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: consider removing `for<...>`

error: aborting due to 5 previous errors

For more information about this error, try `rustc --explain E0658`.
Loading