Back to single line between errors. Add header space to secondary files

diff --git a/src/libsyntax/errors/emitter.rs b/src/libsyntax/errors/emitter.rs
index 2ba003c5eafbf65d6f7a43c7876ceb754a29696f..6b15aa4f92c573dcf527dca2a7f7d5147226003e 100644 (file)
--- a/src/libsyntax/errors/emitter.rs
+++ b/src/libsyntax/errors/emitter.rs
@@ -238,7 +238,7 @@ fn emit_message_(&mut self,
                 self.first = false;
             } else {
                 if !self.old_school {
-                    write!(self.dst, "\n\n")?;
+                    write!(self.dst, "\n")?;
                 }
             }
         }
@@ -682,6 +682,7 @@ fn test_hilight_suggestion_issue_11715() {
         println!("r#\"\n{}\"#", str);
         assert_eq!(str, &r#"
   --> dummy.txt:11:1
+   |>
 11 |>         e-lä-vän
    |> ^
 "#[1..]);
@@ -746,6 +747,7 @@ fn test_multispan_highlight() {
 
         let expect_start = &r#"
  --> dummy.txt:1:6
+  |>
 1 |> _____aaaaaa____bbbbbb__cccccdd_
   |>      ^^^^^^    ^^^^^^  ^^^^^^^
 "#[1..];
@@ -818,6 +820,7 @@ fn test_huge_multispan_highlight() {
 
         let expect0 = &r#"
    --> dummy.txt:5:1
+    |>
 5   |> ccccc
     |> ^
 ...
@@ -830,6 +833,7 @@ fn test_huge_multispan_highlight() {
 
         let expect = &r#"
    --> dummy.txt:1:1
+    |>
 1   |> aaaaa
     |> ^
 ...

diff --git a/src/libsyntax/errors/snippet/mod.rs b/src/libsyntax/errors/snippet/mod.rs
index 414da87b749c8a5614b1687d8d3bc14c2b981ff1..2a43a14ddf873bebdb6fa53da50e57dc78502b77 100644 (file)
--- a/src/libsyntax/errors/snippet/mod.rs
+++ b/src/libsyntax/errors/snippet/mod.rs
@@ -494,6 +494,13 @@ fn render_file_lines(&self, codemap: &Rc<CodeMap>) -> Vec<RenderedLine> {
                         }],
                         kind: RenderedLineKind::OtherFileName,
                     });
+                    output.push(RenderedLine {
+                        text: vec![StyledString {
+                            text: "".to_string(),
+                            style: Style::FileNameStyle,
+                        }],
+                        kind: RenderedLineKind::Annotations,
+                    });
                 }
             }
         }

diff --git a/src/libsyntax/errors/snippet/test.rs b/src/libsyntax/errors/snippet/test.rs
index 62ce3fa9dd5e9038608254681cfa5c098feb72ed..51fe4572dbc633818459549e6add6167e8b656c4 100644 (file)
--- a/src/libsyntax/errors/snippet/test.rs
+++ b/src/libsyntax/errors/snippet/test.rs
@@ -98,6 +98,7 @@ fn foo() {
     let text = make_string(&lines);
     assert_eq!(&text[..], &"
  --> foo.rs:3:2
+  |>
 3 |> \tbar;
   |> \t^^^
 "[1..]);
@@ -130,6 +131,7 @@ fn foo() {
     println!("text=\n{}", text);
     assert_eq!(&text[..], &r#"
  ::: foo.rs
+  |>
 3 |>     vec.push(vec.pop().unwrap());
   |>     ---      ---                - previous borrow ends here
   |>     |        |
@@ -199,12 +201,14 @@ fn bar() {
     // Note that the `|>` remain aligned across both files:
     assert_eq!(&text[..], &r#"
    --> foo.rs:3:14
+    |>
 3   |>     vec.push(vec.pop().unwrap());
     |>     ---      ^^^                - c
     |>     |        |
     |>     |        b
     |>     a
    ::: bar.rs
+    |>
 17  |>     vec.push();
     |>     ---       - f
     |>     |
@@ -249,6 +253,7 @@ fn foo() {
     println!("text=\n{}", text);
     assert_eq!(&text[..], &r#"
    ::: foo.rs
+    |>
 3   |>     let name = find_id(&data, 22).unwrap();
     |>                         ---- immutable borrow begins here
 ...
@@ -288,6 +293,7 @@ fn foo() {
     println!("text=r#\"\n{}\".trim_left()", text);
     assert_eq!(&text[..], &r#"
  ::: foo.rs
+  |>
 3 |>     vec.push(vec.pop().unwrap());
   |>     --------           ------ D
   |>     ||
@@ -324,6 +330,7 @@ fn foo() {
     println!("text=r#\"\n{}\".trim_left()", text);
     assert_eq!(&text[..], &r#"
  ::: foo.rs
+  |>
 3 |>     vec.push(vec.pop().unwrap());
   |>     ---      ---                - previous borrow ends here
   |>     |        |
@@ -362,6 +369,7 @@ fn foo() {
     println!("text=r#\"\n{}\".trim_left()", text);
     assert_eq!(&text[..], &r#"
    ::: foo.rs
+    |>
 4   |>     let mut vec2 = vec;
     |>                    --- `vec` moved here because it has type `collections::vec::Vec<i32>`
 ...
@@ -398,6 +406,7 @@ fn foo() {
     println!("text=&r#\"\n{}\n\"#[1..]", text);
     assert_eq!(text, &r#"
  ::: foo.rs
+  |>
 3 |>     let mut vec = vec![0, 1, 2];
   |>             ---   ---
 4 |>     let mut vec2 = vec;
@@ -429,6 +438,7 @@ fn foo(x: u32) {
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
  ::: foo.rs
+  |>
 3 |>     fn foo(x: u32) {
   |>     -
 "#[1..]);
@@ -458,6 +468,7 @@ fn foo(x: u32) {
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
  ::: foo.rs
+  |>
 2 |>     fn foo(x: u32) {
   |>     --------------
   |>     |      |
@@ -492,6 +503,7 @@ fn foo(x: u32) {
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
  ::: foo.rs
+  |>
 2 |>     fn foo(x: u32) {
   |>     --------------
   |>     |      |
@@ -537,6 +549,7 @@ fn foo() {
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
  ::: foo.rs
+  |>
 3 |>        let closure = || {
   |>                      - foo
 4 |>            inner
@@ -577,6 +590,7 @@ unsafe impl Send for &'static Foo {
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
   --> foo.rs:11:2
+   |>
 11 |> }
    |>  -
 "#[1..]);

diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/src/test/ui/mismatched_types/issue-26480.stderr
index 48bb546b382d35bce16fc98d67ec85ae27c9a7da..c00594a59c1150fc6f8dde664fcf3b440a736c4b 100644 (file)
--- a/src/test/ui/mismatched_types/issue-26480.stderr
+++ b/src/test/ui/mismatched_types/issue-26480.stderr
@@ -5,7 +5,6 @@ error: mismatched types [--explain E0308]
    |>                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected u64, found usize
 $DIR/issue-26480.rs:38:5: 38:19: note: in this expansion of write! (defined in $DIR/issue-26480.rs)
 
-
 error: non-scalar cast: `_` as `()`
   --> $DIR/issue-26480.rs:33:19
    |>
@@ -13,5 +12,4 @@ error: non-scalar cast: `_` as `()`
    |>                   ^^^^^^^^
 $DIR/issue-26480.rs:39:5: 39:14: note: in this expansion of cast! (defined in $DIR/issue-26480.rs)
 
-
 error: aborting due to 2 previous errors

diff --git a/src/test/ui/mismatched_types/main.stderr b/src/test/ui/mismatched_types/main.stderr
index 0e68c0d0b13520819257f1905976d0986f9d1e77..1af332ee5bea7036b7f216bb554b6c3420a4f67e 100644 (file)
--- a/src/test/ui/mismatched_types/main.stderr
+++ b/src/test/ui/mismatched_types/main.stderr
@@ -6,5 +6,4 @@ error: mismatched types [--explain E0308]
 note: expected type `u32`
 note:    found type `()`
 
-
 error: aborting due to previous error