about summary refs log tree commit diff
path: root/src/comp/driver
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2012-02-15 10:19:51 +0100
committerMarijn Haverbeke <marijnh@gmail.com>2012-02-15 11:53:32 +0100
commit9ff5ba085de572f8efaf501b88eb831d8ee40d47 (patch)
tree03f7e1cbb33736bd9be7e1d0b974cf7f5aaf8711 /src/comp/driver
parent6627890f6bcbf2a2b71229572023cfaec91ab805 (diff)
downloadrust-9ff5ba085de572f8efaf501b88eb831d8ee40d47.tar.gz
rust-9ff5ba085de572f8efaf501b88eb831d8ee40d47.zip
Fix bad line printing for parse errors
The code that extracted lines from partially-parsed files
was broken.

Closes #1848
Diffstat (limited to 'src/comp/driver')
-rw-r--r--src/comp/driver/diagnostic.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/comp/driver/diagnostic.rs b/src/comp/driver/diagnostic.rs
index a0f97842546..8f0570a4349 100644
--- a/src/comp/driver/diagnostic.rs
+++ b/src/comp/driver/diagnostic.rs
@@ -204,8 +204,7 @@ fn highlight_lines(cm: codemap::codemap, sp: span,
     // Print the offending lines
     for line: uint in display_lines {
         io::stderr().write_str(#fmt["%s:%u ", fm.name, line + 1u]);
-        let s = codemap::get_line(fm, line as int);
-        if !str::ends_with(s, "\n") { s += "\n"; }
+        let s = codemap::get_line(fm, line as int) + "\n";
         io::stderr().write_str(s);
     }
     if elided {