about summary refs log tree commit diff
path: root/src/librustc_errors
diff options
context:
space:
mode:
authorOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-03-28 14:10:16 +0200
committerOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-04-25 11:07:42 +0200
commitf4b1e2af6836bcf30a8be05ff6a44df6f61b19f2 (patch)
tree0fc07cb3b3d9a62212d8580a96f543d0f67852f4 /src/librustc_errors
parent3a5567bad45fbde0962263f484ebc76f750920e4 (diff)
downloadrust-f4b1e2af6836bcf30a8be05ff6a44df6f61b19f2.tar.gz
rust-f4b1e2af6836bcf30a8be05ff6a44df6f61b19f2.zip
Improve E0178 suggestion placement
Diffstat (limited to 'src/librustc_errors')
-rw-r--r--src/librustc_errors/emitter.rs9
1 files changed, 6 insertions, 3 deletions
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 {