bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Tweak wording

Browse source
This commit is contained in:
Esteban Küber 2022-12-28 18:46:20 -08:00
parent 38fd5a9acf
commit 698ebe357f
14 changed files with 94 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -2586,7 +2586,6 @@ impl<'a> Parser<'a> {
break;
}
if let Some(span) = self.diff_marker(&TokenKind::EqEq, &TokenKind::Eq) {
spans.push(span);
middle = Some(span);
}
if let Some(span) = self.diff_marker(&TokenKind::BinOp(token::Shr), &TokenKind::Gt) {
@ -2597,13 +2596,25 @@ impl<'a> Parser<'a> {
self.bump();
}
let mut err = self.struct_span_err(spans, "encountered diff marker");
err.span_label(start, "start");
err.span_label(start, "after this is the code before the merge");
if let Some(middle) = middle {
err.span_label(middle, "middle");
err.span_label(middle, "");
}
if let Some(end) = end {
err.span_label(end, "end");
err.span_label(end, "above this are the incoming code changes");
}
err.help(
"if you're having merge conflicts after pulling new code, the top section is the code \
you already had and the bottom section is the remote code",
);
err.help(
"if you're in the middle of a rebase, the top section is the code being rebased onto \
and the bottom section is the code coming from the current commit being rebased",
);
err.note(
"for an explanation on these markers from the `git` documentation, visit \
<https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>",
);
err.emit();
FatalError.raise()
}

2
compiler/rustc_parse/src/parser/item.rs
View file

@ -1583,7 +1583,7 @@ impl<'a> Parser<'a> {
p.collect_tokens_trailing_token(attrs, ForceCollect::No, |p, attrs| {
let mut snapshot = None;
if p.is_diff_marker(&TokenKind::BinOp(token::Shl), &TokenKind::Lt) {
// Account for `<<<<<<<` diff markers. We can't proactivelly error here because
// Account for `<<<<<<<` diff markers. We can't proactively error here because
// that can be a valid type start, so we snapshot and reparse only we've
// encountered another parse error.
snapshot = Some(p.create_snapshot_for_diagnostic());

2
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -537,7 +537,7 @@ impl<'a> Parser<'a> {
break;
}
if self.is_diff_marker(&TokenKind::BinOp(token::Shl), &TokenKind::Lt) {
// Account for `<<<<<<<` diff markers. We can't proactivelly error here because
// Account for `<<<<<<<` diff markers. We can't proactively error here because
// that can be a valid path start, so we snapshot and reparse only we've
// encountered another parse error.
snapshot = Some(self.create_snapshot_for_diagnostic());