bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove redundant to_string

Browse source
This commit is contained in:
Juan Aguilar Santillana 2020-09-17 10:27:04 +00:00
parent 7bdb5dee7b
commit 7b5d9836c4
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_errors/src/emitter.rs
View file

@ -1227,18 +1227,14 @@ impl EmitterWriter {
} }
draw_note_separator(&mut buffer, 0, max_line_num_len + 1); draw_note_separator(&mut buffer, 0, max_line_num_len + 1);
if *level != Level::FailureNote { if *level != Level::FailureNote {
let level_str = level.to_string(); buffer.append(0, level.to_str(), Style::MainHeaderMsg);
if !level_str.is_empty() {
buffer.append(0, &level_str, Style::MainHeaderMsg);
buffer.append(0, ": ", Style::NoStyle); buffer.append(0, ": ", Style::NoStyle);
} }
}
self.msg_to_buffer(&mut buffer, msg, max_line_num_len, "note", None); self.msg_to_buffer(&mut buffer, msg, max_line_num_len, "note", None);
} else { } else {
let level_str = level.to_string();
// The failure note level itself does not provide any useful diagnostic information // The failure note level itself does not provide any useful diagnostic information
if *level != Level::FailureNote && !level_str.is_empty() { if *level != Level::FailureNote {
buffer.append(0, &level_str, Style::Level(*level)); buffer.append(0, level.to_str(), Style::Level(*level));
} }
// only render error codes, not lint codes // only render error codes, not lint codes
if let Some(DiagnosticId::Error(ref code)) = *code { if let Some(DiagnosticId::Error(ref code)) = *code {
@ -1246,7 +1242,7 @@ impl EmitterWriter {
buffer.append(0, &code, Style::Level(*level)); buffer.append(0, &code, Style::Level(*level));
buffer.append(0, "]", Style::Level(*level)); buffer.append(0, "]", Style::Level(*level));
} }
if *level != Level::FailureNote && !level_str.is_empty() { if *level != Level::FailureNote {
buffer.append(0, ": ", header_style); buffer.append(0, ": ", header_style);
} }
for &(ref text, _) in msg.iter() { for &(ref text, _) in msg.iter() {
@ -1548,11 +1544,9 @@ impl EmitterWriter {
let mut buffer = StyledBuffer::new(); let mut buffer = StyledBuffer::new();
// Render the suggestion message // Render the suggestion message
let level_str = level.to_string(); buffer.append(0, level.to_str(), Style::Level(*level));
if !level_str.is_empty() {
buffer.append(0, &level_str, Style::Level(*level));
buffer.append(0, ": ", Style::HeaderMsg); buffer.append(0, ": ", Style::HeaderMsg);
}
self.msg_to_buffer( self.msg_to_buffer(
&mut buffer, &mut buffer,
&[(suggestion.msg.to_owned(), Style::NoStyle)], &[(suggestion.msg.to_owned(), Style::NoStyle)],