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 13:06:01 +0200
committerOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-04-25 11:07:42 +0200
commit3a5567bad45fbde0962263f484ebc76f750920e4 (patch)
tree4afc9e8d848f6276feff88183fce38f0e1455146 /src/librustc_errors
parentca701d7aeb6cd16a6c1fe94230918535e9e3164d (diff)
downloadrust-3a5567bad45fbde0962263f484ebc76f750920e4.tar.gz
rust-3a5567bad45fbde0962263f484ebc76f750920e4.zip
Address PR comments
Diffstat (limited to 'src/librustc_errors')
-rw-r--r--src/librustc_errors/emitter.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index 8855859d7c4..085424ef7e6 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -37,7 +37,9 @@ 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 {
+            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
                 let msg = format!("{} `{}`", sugg.msg, sugg.substitutes[0]);
                 primary_span.push_span_label(sugg.msp.primary_spans()[0], msg);
             } else {