diff options
| author | bors <bors@rust-lang.org> | 2024-05-18 17:20:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-18 17:20:48 +0000 |
| commit | c00957a3e269219413041a4e3565f33b1f9d0779 (patch) | |
| tree | 79187d51c27bb36b149e152eaeeea05a9e4b4b01 /compiler/rustc_parse/src/parser/expr.rs | |
| parent | cf2baaa8350c9cac9a5bc139926bcb246303b9f8 (diff) | |
| parent | cd1ca14c4860ced5790d1fd00bbdb9424478b72e (diff) | |
| download | rust-c00957a3e269219413041a4e3565f33b1f9d0779.tar.gz rust-c00957a3e269219413041a4e3565f33b1f9d0779.zip | |
Auto merge of #125254 - matthiaskrgr:rollup-ukvsxbc, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #125117 (Improve parser) - #125184 (Fix ICE in non-operand `aggregate_raw_ptr` intrinsic codegen) - #125240 (Temporarily revert to NonZeroUsize in rustc-abi to fix building on stable) - #125248 (Migrate `run-make/rustdoc-scrape-examples-invalid-expr` to `rmake.rs`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser/expr.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index cbc7ce9ef7c..d2d21624150 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -3734,7 +3734,7 @@ impl<'a> Parser<'a> { /// Parses `ident (COLON expr)?`. fn parse_expr_field(&mut self) -> PResult<'a, ExprField> { let attrs = self.parse_outer_attributes()?; - self.recover_diff_marker(); + self.recover_vcs_conflict_marker(); self.collect_tokens_trailing_token(attrs, ForceCollect::No, |this, attrs| { let lo = this.token.span; |