From 9e49ac067f205e4400e85c98e35c2fe9af820d7d Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Fri, 5 Oct 2018 14:30:45 +0200
Subject: [PATCH] Change from label to suggestion.

This commit changes the label to a maybe incorrect suggestion for better
integration with RLS.
---
 src/librustc_mir/borrow_check/mutability_errors.rs | 13 ++++++++-----
 src/test/ui/did_you_mean/issue-38147-2.nll.stderr  |  2 +-
 src/test/ui/did_you_mean/issue-38147-3.nll.stderr  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/librustc_mir/borrow_check/mutability_errors.rs b/src/librustc_mir/borrow_check/mutability_errors.rs
index fe24ec382ceb3..5ab1605d7f07a 100644
--- a/src/librustc_mir/borrow_check/mutability_errors.rs
+++ b/src/librustc_mir/borrow_check/mutability_errors.rs
@@ -241,7 +241,12 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
                     base.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx),
                     field,
                 ) {
-                    err.span_label(span, message);
+                    err.span_suggestion_with_applicability(
+                        span,
+                        "consider changing this to be mutable",
+                        message,
+                        Applicability::MaybeIncorrect,
+                    );
                 }
             },
 
@@ -636,8 +641,6 @@ fn annotate_struct_field(
     if let ty::TyKind::Ref(_, ty, _) = ty.sty {
         if let ty::TyKind::Adt(def, _) = ty.sty {
             let field = def.all_fields().nth(field.index())?;
-            let span = tcx.def_span(field.did);
-
             // Use the HIR types to construct the diagnostic message.
             let node_id = tcx.hir.as_local_node_id(field.did)?;
             let node = tcx.hir.find(node_id)?;
@@ -659,9 +662,9 @@ fn annotate_struct_field(
                     };
 
                     return Some((
-                        span,
+                        field.ty.span,
                         format!(
-                            "use `&{}mut {}` here to make mutable",
+                            "&{}mut {}",
                             lifetime_snippet, &*type_snippet,
                         ),
                     ));
diff --git a/src/test/ui/did_you_mean/issue-38147-2.nll.stderr b/src/test/ui/did_you_mean/issue-38147-2.nll.stderr
index 91ccef1a32f1f..ebd44d46eb2ce 100644
--- a/src/test/ui/did_you_mean/issue-38147-2.nll.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-2.nll.stderr
@@ -2,7 +2,7 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` referenc
   --> $DIR/issue-38147-2.rs:17:9
    |
 LL |     s: &'a String
-   |     ------------- use `&'a mut String` here to make mutable
+   |        ---------- help: consider changing this to be mutable: `&'a mut String`
 ...
 LL |         self.s.push('x');
    |         ^^^^^^ cannot borrow as mutable
diff --git a/src/test/ui/did_you_mean/issue-38147-3.nll.stderr b/src/test/ui/did_you_mean/issue-38147-3.nll.stderr
index ecc80a1d4310b..d644a84c7bbce 100644
--- a/src/test/ui/did_you_mean/issue-38147-3.nll.stderr
+++ b/src/test/ui/did_you_mean/issue-38147-3.nll.stderr
@@ -2,7 +2,7 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` referenc
   --> $DIR/issue-38147-3.rs:17:9
    |
 LL |     s: &'a String
-   |     ------------- use `&'a mut String` here to make mutable
+   |        ---------- help: consider changing this to be mutable: `&'a mut String`
 ...
 LL |         self.s.push('x');
    |         ^^^^^^ cannot borrow as mutable