diff options
| author | bors <bors@rust-lang.org> | 2024-12-08 22:11:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-08 22:11:42 +0000 |
| commit | df5b8e39b7def660696340b199ae395a869b3064 (patch) | |
| tree | fb1866fd2eeae49d5febafea0f2d7b25bd2dae95 /compiler/rustc_parse/src/parser/nonterminal.rs | |
| parent | 4d669fb34e7db6f3825d01e4c59b7996f0531431 (diff) | |
| parent | 5b133fe47d7fca7476fa40f566982b34739fa612 (diff) | |
| download | rust-df5b8e39b7def660696340b199ae395a869b3064.tar.gz rust-df5b8e39b7def660696340b199ae395a869b3064.zip | |
Auto merge of #134039 - matthiaskrgr:rollup-ix8kdg1, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #133424 (Parse guard patterns) - #133733 ( compiletest: show the difference between the normalized output and the actual output for lines which didn't match) - #133993 (Fix: typo in E0751 error explanation) - #134013 (Adds new intrinsic declaration) - #134020 (Remove unnecessary `int_type_width_signed` function) - #134024 (Advent of `tests/ui` (misc cleanups and improvements) [2/N]) - #134038 (deps: Update psm) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser/nonterminal.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/nonterminal.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/nonterminal.rs b/compiler/rustc_parse/src/parser/nonterminal.rs index 8fb6f85d0dd..752a52b382b 100644 --- a/compiler/rustc_parse/src/parser/nonterminal.rs +++ b/compiler/rustc_parse/src/parser/nonterminal.rs @@ -174,7 +174,7 @@ impl<'a> Parser<'a> { NonterminalKind::Pat(pat_kind) => { NtPat(self.collect_tokens_no_attrs(|this| match pat_kind { PatParam { .. } => this.parse_pat_no_top_alt(None, None), - PatWithOr => this.parse_pat_allow_top_alt( + PatWithOr => this.parse_pat_no_top_guard( None, RecoverComma::No, RecoverColon::No, |