From 1fdbfcdbd0a6a63317872fef24222533bbc8cfaf Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 26 Apr 2016 09:33:38 -0700
Subject: only emit `^` at the start of a multi-line error

as a result, simplify elision code
---
 src/libsyntax/errors/emitter.rs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/libsyntax/errors/emitter.rs')

diff --git a/src/libsyntax/errors/emitter.rs b/src/libsyntax/errors/emitter.rs
index 07dafb0b7df..eaa973db2b8 100644
--- a/src/libsyntax/errors/emitter.rs
+++ b/src/libsyntax/errors/emitter.rs
@@ -543,7 +543,7 @@ mod test {
         dreizehn
         ";
         let file = cm.new_filemap_and_lines("dummy.txt", content);
-        let start = file.lines.borrow()[7];
+        let start = file.lines.borrow()[10];
         let end = file.lines.borrow()[11];
         let sp = mk_sp(start, end);
         let lvl = Level::Error;
@@ -555,12 +555,9 @@ mod test {
         let str = from_utf8(vec).unwrap();
         println!("r#\"\n{}\"#", str);
         assert_eq!(str, &r#"
-   --> dummy.txt:8:1
-8   |>         line8
-    |> ^^^^^^^^^^^^^
-...
+   --> dummy.txt:11:1
 11  |>         e-lä-vän
-    |> ^^^^^^^^^^^^^^^^
+    |> ^
 "#[1..]);
     }
 
@@ -696,9 +693,8 @@ mod test {
         let expect0 = &r#"
    --> dummy.txt:5:1
 5   |> ccccc
-    |> ^^^^^
+    |> ^
 ...
-8   |> _____
 9   |> ddd__eee_
     |> ^^^  ^^^
 10  |> elided
@@ -709,9 +705,8 @@ mod test {
         let expect = &r#"
    --> dummy.txt:1:1
 1   |> aaaaa
-    |> ^^^^^
+    |> ^
 ...
-8   |> _____
 9   |> ddd__eee_
     |> ^^^  ^^^
 10  |> elided
-- 
cgit 1.4.1-3-g733a5