Skip to content

Commit 3616135

Browse files
committed
Indent code past the widest line number
Fixes rust-lang#11715
1 parent aecf3d8 commit 3616135

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/libsyntax/diagnostic.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,12 +588,18 @@ fn highlight_lines(err: &mut EmitterWriter,
588588
let display_line_infos = &lines.lines[..display_lines];
589589
let display_line_strings = &line_strings[..display_lines];
590590

591+
// Calculate the widest number to format evenly and fix #11715
592+
assert!(display_line_infos.len > 0);
593+
let mut max_line_num = display_line_infos[display_line_infos.len() - 1].line_index + 1;
594+
let mut digits = 0;
595+
while max_line_num > 0 { max_line_num /= 10; digits += 1; }
591596
// Print the offending lines
592597
for (line_info, line) in display_line_infos.iter().zip(display_line_strings.iter()) {
593-
try!(write!(&mut err.dst, "{}:{} {}\n",
598+
try!(write!(&mut err.dst, "{}:{:>width$} {}\n",
594599
fm.name,
595600
line_info.line_index + 1,
596-
line));
601+
line,
602+
width=digits));
597603
}
598604

599605
// If we elided something, put an ellipsis.

0 commit comments

Comments
 (0)