From f4b1e2af6836bcf30a8be05ff6a44df6f61b19f2 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Tue, 28 Mar 2017 14:10:16 +0200 Subject: Improve E0178 suggestion placement --- src/librustc_errors/emitter.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/librustc_errors') diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs index 085424ef7e6..68e58e230f8 100644 --- a/src/librustc_errors/emitter.rs +++ b/src/librustc_errors/emitter.rs @@ -37,9 +37,12 @@ impl Emitter for EmitterWriter { if let Some(sugg) = db.suggestion.clone() { assert_eq!(sugg.msp.primary_spans().len(), sugg.substitutes.len()); - if sugg.substitutes.len() == 1 && // don't display multispans as labels - sugg.msg.split_whitespace().count() < 10 && // don't display long messages as labels - sugg.substitutes[0].find('\n').is_none() { // don't display multiline suggestions as labels + // don't display multispans as labels + if sugg.substitutes.len() == 1 && + // don't display long messages as labels + sugg.msg.split_whitespace().count() < 10 && + // don't display multiline suggestions as labels + sugg.substitutes[0].find('\n').is_none() { let msg = format!("{} `{}`", sugg.msg, sugg.substitutes[0]); primary_span.push_span_label(sugg.msp.primary_spans()[0], msg); } else { -- cgit 1.4.1-3-g733a5