diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-18 18:44:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-18 18:44:14 +0200 |
| commit | f9bf759e833f21edfa99ea63cc0fc57cf575227e (patch) | |
| tree | 74d86b5fe2e6c5009e723cf0367b7aee2ae6de71 /compiler/rustc_parse/src/parser/expr.rs | |
| parent | 685a80f7a0935c8e5016d8c9cd491937af155dd0 (diff) | |
| parent | f8433a82b4a4120e34de236a68d0cfeaea6e60c3 (diff) | |
| download | rust-f9bf759e833f21edfa99ea63cc0fc57cf575227e.tar.gz rust-f9bf759e833f21edfa99ea63cc0fc57cf575227e.zip | |
Rollup merge of #125117 - dev-ardi:improve-parser, r=wesleywiser,fmease
Improve parser Fixes #124935. - Add a few more help diagnostics to incorrect semicolons - Overall improved that function - Addded a few comments - Renamed diff_marker fns to git_diff_marker
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; |