Add support for diff3 format

diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
index dd7341af4d52ca2808f54bd8d56bffdbecf229cf..7ab924bd39d9be201eb08648d5ee46493e035dc3 100644 (file)
--- a/compiler/rustc_parse/src/parser/diagnostics.rs
+++ b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -2579,12 +2579,16 @@ pub fn recover_diff_marker(&mut self) {
         };
         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 @@ pub fn recover_diff_marker(&mut self) {
         }
         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, "");
         }

diff --git a/src/test/ui/parser/diff-markers/enum-2.rs b/src/test/ui/parser/diff-markers/enum-2.rs
index d8c527281de1838b04eeb77f3e0ed9d633bf8239..76ea980fc628d562a351a626cf37a20686d2cdd0 100644 (file)
--- a/src/test/ui/parser/diff-markers/enum-2.rs
+++ b/src/test/ui/parser/diff-markers/enum-2.rs
@@ -2,8 +2,10 @@ enum E {
     Foo {
 <<<<<<< HEAD //~ ERROR encountered diff marker
         x: u8,
+|||||||
+        z: (),
 =======
-        x: i8,
+        y: i8,
 >>>>>>> branch
     }
 }

diff --git a/src/test/ui/parser/diff-markers/enum-2.stderr b/src/test/ui/parser/diff-markers/enum-2.stderr
index 4e612a5427a12483193acde0593a0339f8887571..63da5c2a6e1f3b8d57ac8f74c2bbcccbd2f3a89c 100644 (file)
--- a/src/test/ui/parser/diff-markers/enum-2.stderr
+++ b/src/test/ui/parser/diff-markers/enum-2.stderr
@@ -4,9 +4,12 @@ error: encountered diff marker
 LL | <<<<<<< HEAD
    | ^^^^^^^ after this is the code before the merge
 LL |         x: u8,
+LL | |||||||
+   | -------
+LL |         z: (),
 LL | =======
    | -------
-LL |         x: i8,
+LL |         y: i8,
 LL | >>>>>>> branch
    | ^^^^^^^ above this are the incoming code changes
    |