Skip to content

Commit 508d032

Browse files
committed
review comment: deduplicate logic
1 parent 0baf61b commit 508d032

File tree

1 file changed

+13
-27
lines changed

1 file changed

+13
-27
lines changed

src/librustc_errors/emitter.rs

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,27 +1583,26 @@ impl EmitterWriter {
15831583
Ok(())
15841584
}
15851585

1586-
fn emit_messages_default(&mut self,
1587-
level: &Level,
1588-
message: &[(String, Style)],
1589-
code: &Option<DiagnosticId>,
1590-
span: &MultiSpan,
1591-
children: &[SubDiagnostic],
1592-
suggestions: &[CodeSuggestion]) {
1586+
fn emit_messages_default(
1587+
&mut self,
1588+
level: &Level,
1589+
message: &[(String, Style)],
1590+
code: &Option<DiagnosticId>,
1591+
span: &MultiSpan,
1592+
children: &[SubDiagnostic],
1593+
suggestions: &[CodeSuggestion],
1594+
) {
15931595
let max_line_num_len = if self.ui_testing {
15941596
ANONYMIZED_LINE_NUM.len()
15951597
} else {
15961598
self.get_max_line_num(span, children).to_string().len()
15971599
};
15981600

1599-
match self.emit_message_default(span,
1600-
message,
1601-
code,
1602-
level,
1603-
max_line_num_len,
1604-
false) {
1601+
match self.emit_message_default(span, message, code, level, max_line_num_len, false) {
16051602
Ok(()) => {
1606-
if !children.is_empty() {
1603+
if !children.is_empty() || suggestions.iter().any(|s| {
1604+
s.style != SuggestionStyle::CompletelyHidden
1605+
}) {
16071606
let mut buffer = StyledBuffer::new();
16081607
if !self.short_message {
16091608
draw_col_separator_no_space(&mut buffer, 0, max_line_num_len + 1);
@@ -1629,19 +1628,6 @@ impl EmitterWriter {
16291628
_ => ()
16301629
}
16311630
}
1632-
if children.is_empty() && suggestions.iter().any(|s| {
1633-
s.style != SuggestionStyle::CompletelyHidden
1634-
}) {
1635-
let mut buffer = StyledBuffer::new();
1636-
if !self.short_message {
1637-
draw_col_separator_no_space(&mut buffer, 0, max_line_num_len + 1);
1638-
}
1639-
match emit_to_destination(&buffer.render(), level, &mut self.dst,
1640-
self.short_message) {
1641-
Ok(()) => (),
1642-
Err(e) => panic!("failed to emit error: {}", e)
1643-
}
1644-
}
16451631
for sugg in suggestions {
16461632
if sugg.style == SuggestionStyle::CompletelyHidden {
16471633
// do not display this suggestion, it is meant only for tools

0 commit comments

Comments
 (0)