about summary refs log tree commit diff
path: root/compiler/rustc_parse/src/parser
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-10-29 16:46:47 +0000
committerbors <bors@rust-lang.org>2023-10-29 16:46:47 +0000
commit88ae8c93854a1a67c6c0a45971c7198477456c33 (patch)
treea29b49ed6ad75faea08e67e92ebd856f7c0851ff /compiler/rustc_parse/src/parser
parent83c9732e0c7e1cae5f039677da4c51ee1d9b19b0 (diff)
parentfe00cfef57fcd54d89a09b69819eb66cf90edf70 (diff)
downloadrust-88ae8c93854a1a67c6c0a45971c7198477456c33.tar.gz
rust-88ae8c93854a1a67c6c0a45971c7198477456c33.zip
Auto merge of #116889 - MU001999:master, r=petrochenkov
Eat close paren if capture_cfg to avoid unbalanced parens

Fixes #116781
Diffstat (limited to 'compiler/rustc_parse/src/parser')
-rw-r--r--compiler/rustc_parse/src/parser/item.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
index 4c76ade0139..a9f456d64cd 100644
--- a/compiler/rustc_parse/src/parser/item.rs
+++ b/compiler/rustc_parse/src/parser/item.rs
@@ -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).