From c1ba5ac62c14ab5e231edcce914fd33f0e32c2d1 Mon Sep 17 00:00:00 2001
From: Yukio Siraichi <yukio.siraichi@gmail.com>
Date: Fri, 16 Mar 2018 17:58:11 -0300
Subject: [PATCH] Reporting with `span_suggestion_short`.

---
 src/librustc/traits/error_reporting.rs | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index 1bbd24de6ae4..267d84cc5314 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 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>();
-
-                        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;
                     }