Skip to content

Commit

Permalink
Auto merge of rust-lang#116889 - MU001999:master, r=petrochenkov
Browse files Browse the repository at this point in the history
Eat close paren if capture_cfg to avoid unbalanced parens

Fixes rust-lang#116781
  • Loading branch information
bors committed Oct 29, 2023
2 parents 83c9732 + fe00cfe commit 88ae8c9
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
2 changes: 2 additions & 0 deletions compiler/rustc_parse/src/parser/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2501,9 +2501,11 @@ impl<'a> Parser<'a> {
// Parse the arguments, starting out with `self` being allowed...
let (mut params, _) = self.parse_paren_comma_seq(|p| {
p.recover_diff_marker();
let snapshot = p.create_snapshot_for_diagnostic();
let param = p.parse_param_general(req_name, first_param).or_else(|mut e| {
e.emit();
let lo = p.prev_token.span;
p.restore_snapshot(snapshot);
// Skip every token until next possible arg or end.
p.eat_to_tokens(&[&token::Comma, &token::CloseDelim(Delimiter::Parenthesis)]);
// Create a placeholder argument for proper arg count (issue #34264).
Expand Down
8 changes: 8 additions & 0 deletions tests/ui/parser/issue-116781.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#[derive(Debug)]
struct Foo {
#[cfg(all())]
field: fn(($),), //~ ERROR expected pattern, found `$`
//~^ ERROR expected pattern, found `$`
}

fn main() {}
16 changes: 16 additions & 0 deletions tests/ui/parser/issue-116781.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
error: expected pattern, found `$`
--> $DIR/issue-116781.rs:4:16
|
LL | field: fn(($),),
| ^ expected pattern

error: expected pattern, found `$`
--> $DIR/issue-116781.rs:4:16
|
LL | field: fn(($),),
| ^ expected pattern
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: aborting due to 2 previous errors

0 comments on commit 88ae8c9

Please sign in to comment.