nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-09 16:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate and document logic

Browse Source
This commit is contained in:
Esteban Küber 2017-01-09 09:07:34 -08:00
parent 690476191d
commit 04e4a60b45
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/librustc_errors/emitter.rs
View File

@ -703,10 +703,29 @@ impl EmitterWriter {
} }
} }
fn msg_with_padding(&self, msg: &str, padding: usize) -> String { /// Add a left margin to every line but the first, given a padding length and the label being
let padding = (0..padding) /// displayed.
fn msg_with_padding(&self, msg: &str, padding: usize, label: &str) -> String {
// The extra 5 ` ` is padding that's always needed to align to the `note: `:
//
// error: message
// --> file.rs:13:20
// |
// 13 | <CODE>
// | ^^^^
// |
// = note: multiline
// message
// ++^^^----xx
// | | | |
// | | | magic `2`
// | | length of label
// | magic `3`
// `max_line_num_len`
let padding = (0..padding + label.len() + 5)
.map(|_| " ") .map(|_| " ")
.collect::<String>(); .collect::<String>();
msg.split('\n').enumerate().fold("".to_owned(), |mut acc, x| { msg.split('\n').enumerate().fold("".to_owned(), |mut acc, x| {
if x.0 != 0 { if x.0 != 0 {
acc.push_str("\n"); acc.push_str("\n");
@ -737,8 +756,7 @@ impl EmitterWriter {
buffer.append(0, &level.to_string(), Style::HeaderMsg); buffer.append(0, &level.to_string(), Style::HeaderMsg);
buffer.append(0, ": ", Style::NoStyle); buffer.append(0, ": ", Style::NoStyle);
// The extra 3 ` ` is the padding that's always needed to align to the `note: `. let message = self.msg_with_padding(msg, max_line_num_len, "note");
let message = self.msg_with_padding(msg, max_line_num_len + "note: ".len() + 3);
buffer.append(0, &message, Style::NoStyle); buffer.append(0, &message, Style::NoStyle);
} else { } else {
buffer.append(0, &level.to_string(), Style::Level(level.clone())); buffer.append(0, &level.to_string(), Style::Level(level.clone()));
@ -873,8 +891,7 @@ impl EmitterWriter {
buffer.append(0, &level.to_string(), Style::Level(level.clone())); buffer.append(0, &level.to_string(), Style::Level(level.clone()));
buffer.append(0, ": ", Style::HeaderMsg); buffer.append(0, ": ", Style::HeaderMsg);
// The extra 3 ` ` is the padding that's always needed to align to the `suggestion: `. let message = self.msg_with_padding(msg, max_line_num_len, "suggestion");
let message = self.msg_with_padding(msg, max_line_num_len + "suggestion: ".len() + 3);
buffer.append(0, &message, Style::HeaderMsg); buffer.append(0, &message, Style::HeaderMsg);
let lines = cm.span_to_lines(primary_span).unwrap(); let lines = cm.span_to_lines(primary_span).unwrap();