From f41dc775a3ae1f002c24fdff6b2f7c4b68ceca66 Mon Sep 17 00:00:00 2001
From: Yukio Siraichi <yukio.siraichi@gmail.com>
Date: Wed, 14 Mar 2018 06:41:05 -0300
Subject: [PATCH] Keeping code formatting.

Suggesting snippet without changing the original formatting of the code.
---
 src/librustc/traits/error_reporting.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index 31c8cb25c521..1bbd24de6ae4 100644
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -914,11 +914,16 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                                                          new_trait_ref.to_predicate());
 
                     if selcx.evaluate_obligation(&new_obligation) {
-                        let remove_refs = refs_remaining + 1;
+                        let mut remove_refs = refs_remaining + 1;
 
                         let suggest_snippet = snippet.chars()
-                            .filter(|c| !c.is_whitespace())
-                            .skip(remove_refs)
+                            .skip_while(|c| c.is_whitespace() || {
+                                if *c == '&' && remove_refs > 0 {
+                                    true
+                                } else {
+                                    false
+                                }
+                            })
                             .collect::<String>();
 
                         err.span_suggestion(span,