Reporting with `span_suggestion_short`.

diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index 1bbd24de6ae4625a7f8e2fe155721b427108cf0e..267d84cc531415ed1553f7e8706a91d33c51130f 100644 (file)
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -914,22 +914,12 @@ fn suggest_remove_reference(&self,
                                                          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;
                     }