diff options
| author | bors <bors@rust-lang.org> | 2024-04-12 04:16:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-12 04:16:12 +0000 |
| commit | 6475796a813f2153d3bfc92c6089ed0f0c1c5b46 (patch) | |
| tree | 66b7bc80390e86b2381d299fef14b762aa23cc07 /compiler/rustc_parse/src | |
| parent | 46961d24071fdc43252d5d54e1e866040a256923 (diff) | |
| parent | 2679ea09fef39a3e01728208ae8059fbfd9de8fd (diff) | |
| download | rust-6475796a813f2153d3bfc92c6089ed0f0c1c5b46.tar.gz rust-6475796a813f2153d3bfc92c6089ed0f0c1c5b46.zip | |
Auto merge of #123838 - matthiaskrgr:rollup-zkgwyye, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #123599 (remove some things that do not need to be) - #123763 (Set the host library path in run-make v2) - #123775 (Make `PlaceRef` and `OperandValue::Ref` share a common `PlaceValue` type) - #123789 (move QueryKeyStringCache from rustc_middle to rustc_query_impl, where it actually used) - #123826 (Move rare overflow error to a cold function) - #123827 (linker: Avoid some allocations in search directory iteration) - #123829 (Fix revisions syntax in cfg(ub_checks) test) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 012285e4644..00947a4c585 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -3585,8 +3585,7 @@ impl<'a> Parser<'a> { match self.expect_one_of(&[token::Comma], &[token::CloseDelim(close_delim)]) { Ok(_) => { - if let Some(f) = - parsed_field.or_else(|guar| field_ident(self, guar).ok_or(guar)).ok() + if let Ok(f) = parsed_field.or_else(|guar| field_ident(self, guar).ok_or(guar)) { // Only include the field if there's no parse error for the field name. fields.push(f); |
