about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYukio Siraichi <yukio.siraichi@gmail.com>2018-03-16 17:58:11 -0300
committerYukio Siraichi <yukio.siraichi@gmail.com>2018-03-18 20:46:28 -0300
commitc1ba5ac62c14ab5e231edcce914fd33f0e32c2d1 (patch)
tree96403ea82da75d95c5ae838104aaf175dedd30cc
parentf6bffd16d15672557e7d9c32b0cca08639a32251 (diff)
downloadrust-c1ba5ac62c14ab5e231edcce914fd33f0e32c2d1.tar.gz
rust-c1ba5ac62c14ab5e231edcce914fd33f0e32c2d1.zip
Reporting with `span_suggestion_short`.
-rw-r--r--src/librustc/traits/error_reporting.rs20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index 1bbd24de6ae..267d84cc531 100644
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -914,22 +914,12 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                                                          new_trait_ref.to_predicate());
 
                     if selcx.evaluate_obligation(&new_obligation) {
-                        let mut remove_refs = refs_remaining + 1;
-
-                        let suggest_snippet = snippet.chars()
-                            .skip_while(|c| c.is_whitespace() || {
-                                if *c == '&' && remove_refs > 0 {
-                                    true
-                                } else {
-                                    false
-                                }
-                            })
-                            .collect::<String>();
+                        let remove_refs = refs_remaining + 1;
 
-                        err.span_suggestion(span,
-                                            &format!("consider removing {} references `&`",
-                                                    remove_refs),
-                                            format!("{}", suggest_snippet));
+                        err.span_suggestion_short(span,
+                                                  &format!("consider removing {} leading `&`-references",
+                                                           remove_refs),
+                                                  String::from(""));
 
                         break;
                     }