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

Add support for diff3 format

Browse source
This commit is contained in:
Esteban Küber 2022-12-28 20:55:46 -08:00
parent 698ebe357f
commit 62c8e3144a
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2579,12 +2579,16 @@ impl<'a> Parser<'a> {
};
let mut spans = Vec::with_capacity(3);
spans.push(start);
let mut middlediff3 = None;
let mut middle = None;
let mut end = None;
loop {
if self.token.kind == TokenKind::Eof {
break;
}
if let Some(span) = self.diff_marker(&TokenKind::OrOr, &TokenKind::BinOp(token::Or)) {
middlediff3 = Some(span);
}
if let Some(span) = self.diff_marker(&TokenKind::EqEq, &TokenKind::Eq) {
middle = Some(span);
}
@ -2597,6 +2601,9 @@ impl<'a> Parser<'a> {
}
let mut err = self.struct_span_err(spans, "encountered diff marker");
err.span_label(start, "after this is the code before the merge");
if let Some(middle) = middlediff3 {
err.span_label(middle, "");
}
if let Some(middle) = middle {
err.span_label(middle, "");
}