diff options
| author | ardi <ardis@ardi.dev> | 2024-05-08 14:22:09 +0200 |
|---|---|---|
| committer | ardi <ardis@ardi.dev> | 2024-05-17 15:45:50 +0200 |
| commit | 1f6d271527cd2ae25b586277d02ab71c1332f57c (patch) | |
| tree | 0dc1108c2ed7c43585c4218f8032428b7aef6a2b /compiler/rustc_parse/src/parser/expr.rs | |
| parent | 8dc6a5d145af86955402ec02907dda77dcb4a122 (diff) | |
| download | rust-1f6d271527cd2ae25b586277d02ab71c1332f57c.tar.gz rust-1f6d271527cd2ae25b586277d02ab71c1332f57c.zip | |
Clarify that the diff_marker is talking about version control system
conflicts specifically and a few more improvements.
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; |