Auto merge of #29738 - sanxiyn:suggest-mut, r=nrc

Fix #16410.

src/librustc_borrowck/borrowck/mod.rs

@@ -1015,7 +1015,18 @@ pub fn note_and_explain_bckerr(&self, err: BckError<'tcx>) {
                                  self by mutable reference");
                         }
                     }
-                    _ => {}
+                    _ => {
+                        if let Categorization::Local(local_id) = err.cmt.cat {
+                            let span = self.tcx.map.span(local_id);
+                            if let Ok(snippet) = self.tcx.sess.codemap().span_to_snippet(span) {
+                                self.tcx.sess.span_suggestion(
+                                    span,
+                                    &format!("to make the {} mutable, use `mut` as shown:",
+                                             self.cmt_to_string(&err.cmt)),
+                                    format!("mut {}", snippet));
+                            }
+                        }
+                    }
                 }
             }
 

src/test/compile-fail/mut-suggestion.rs

+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[derive(Copy, Clone)]
+struct S;
+
+impl S {
+    fn mutate(&mut self) {
+    }
+}
+
+fn func(arg: S) {
+    //~^ HELP use `mut` as shown
+    //~| SUGGESTION fn func(mut arg: S) {
+    arg.mutate(); //~ ERROR cannot borrow immutable argument
+}
+
+fn main() {
+    let local = S;
+    //~^ HELP use `mut` as shown
+    //~| SUGGESTION let mut local = S;
+    local.mutate(); //~ ERROR cannot borrow immutable local variable
+}