Better span for "make binding mutable" suggestion

estebank · estebank · commit 783c4b9d7631 · 2024-07-03T21:01:29.000Z
diff --git a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
@@ -3757,13 +3757,11 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, '_, 'infcx, 'tcx> {
         assigned_span: Span,
         err_place: Place<'tcx>,
     ) {
-        let (from_arg, local_decl, local_name) = match err_place.as_local() {
-            Some(local) => (
-                self.body.local_kind(local) == LocalKind::Arg,
-                Some(&self.body.local_decls[local]),
-                self.local_names[local],
-            ),
-            None => (false, None, None),
+        let (from_arg, local_decl) = match err_place.as_local() {
+            Some(local) => {
+                (self.body.local_kind(local) == LocalKind::Arg, Some(&self.body.local_decls[local]))
+            }
+            None => (false, None),
         };
 
         // If root local is initialized immediately (everything apart from let
@@ -3795,13 +3793,12 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, '_, 'infcx, 'tcx> {
             err.span_label(assigned_span, format!("first assignment to {place_description}"));
         }
         if let Some(decl) = local_decl
-            && let Some(name) = local_name
             && decl.can_be_made_mutable()
         {
             err.span_suggestion(
-                decl.source_info.span,
+                decl.source_info.span.shrink_to_lo(),
                 "consider making this binding mutable",
-                format!("mut {name}"),
+                "mut ".to_string(),
                 Applicability::MachineApplicable,
             );
             if !from_arg
@@ -3814,9 +3811,9 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, '_, 'infcx, 'tcx> {
                 )
             {
                 err.span_suggestion(
-                    decl.source_info.span,
+                    decl.source_info.span.shrink_to_lo(),
                     "to modify the original value, take a borrow instead",
-                    format!("ref mut {name}"),
+                    "ref mut ".to_string(),
                     Applicability::MaybeIncorrect,
                 );
             }
diff --git a/tests/ui/assign-imm-local-twice.rs b/tests/ui/assign-imm-local-twice.rs
@@ -1,7 +1,7 @@
 fn test() {
     let v: isize;
     //~^ HELP consider making this binding mutable
-    //~| SUGGESTION mut v
+    //~| SUGGESTION mut
     v = 1; //~ NOTE first assignment
     println!("v={}", v);
     v = 2; //~ ERROR cannot assign twice to immutable variable
diff --git a/tests/ui/assign-imm-local-twice.stderr b/tests/ui/assign-imm-local-twice.stderr
@@ -10,7 +10,7 @@ LL |     v = 2;
 help: consider making this binding mutable
    |
 LL |     let mut v: isize;
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/async-await/issue-61452.stderr b/tests/ui/async-await/issue-61452.stderr
@@ -20,7 +20,7 @@ LL |     x += 1;
 help: consider making this binding mutable
    |
 LL | pub async fn g(mut x: usize) {
-   |                ~~~~~
+   |                +++
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/borrowck/borrowck-match-binding-is-assignment.stderr b/tests/ui/borrowck/borrowck-match-binding-is-assignment.stderr
@@ -9,11 +9,11 @@ LL |             x += 1;
 help: consider making this binding mutable
    |
 LL |         mut x => {
-   |         ~~~~~
+   |         +++
 help: to modify the original value, take a borrow instead
    |
 LL |         ref mut x => {
-   |         ~~~~~~~~~
+   |         +++++++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/borrowck-match-binding-is-assignment.rs:20:13
@@ -26,11 +26,11 @@ LL |             x += 1;
 help: consider making this binding mutable
    |
 LL |         E::Foo(mut x) => {
-   |                ~~~~~
+   |                +++
 help: to modify the original value, take a borrow instead
    |
 LL |         E::Foo(ref mut x) => {
-   |                ~~~~~~~~~
+   |                +++++++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/borrowck-match-binding-is-assignment.rs:26:13
@@ -43,11 +43,11 @@ LL |             x += 1;
 help: consider making this binding mutable
    |
 LL |         S { bar: mut x } => {
-   |                  ~~~~~
+   |                  +++
 help: to modify the original value, take a borrow instead
    |
 LL |         S { bar: ref mut x } => {
-   |                  ~~~~~~~~~
+   |                  +++++++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/borrowck-match-binding-is-assignment.rs:32:13
@@ -60,11 +60,11 @@ LL |             x += 1;
 help: consider making this binding mutable
    |
 LL |         (mut x,) => {
-   |          ~~~~~
+   |          +++
 help: to modify the original value, take a borrow instead
    |
 LL |         (ref mut x,) => {
-   |          ~~~~~~~~~
+   |          +++++++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/borrowck-match-binding-is-assignment.rs:38:13
@@ -77,11 +77,11 @@ LL |             x += 1;
 help: consider making this binding mutable
    |
 LL |         [mut x,_,_] => {
-   |          ~~~~~
+   |          +++
 help: to modify the original value, take a borrow instead
    |
 LL |         [ref mut x,_,_] => {
-   |          ~~~~~~~~~
+   |          +++++++
 
 error: aborting due to 5 previous errors
 
diff --git a/tests/ui/borrowck/immutable-arg.stderr b/tests/ui/borrowck/immutable-arg.stderr
@@ -7,7 +7,7 @@ LL |     _x = 4;
 help: consider making this binding mutable
    |
 LL | fn foo(mut _x: u32) {
-   |        ~~~~~~
+   |        +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/borrowck/issue-45199.rs b/tests/ui/borrowck/issue-45199.rs
@@ -1,7 +1,7 @@
 fn test_drop_replace() {
     let b: Box<isize>;
     //~^ HELP consider making this binding mutable
-    //~| SUGGESTION mut b
+    //~| SUGGESTION mut
     b = Box::new(1);    //~ NOTE first assignment
     b = Box::new(2);    //~ ERROR cannot assign twice to immutable variable `b`
                         //~| NOTE cannot assign twice to immutable
@@ -10,13 +10,13 @@ fn test_drop_replace() {
 fn test_call() {
     let b = Box::new(1);    //~ NOTE first assignment
                             //~| HELP consider making this binding mutable
-                            //~| SUGGESTION mut b
+                            //~| SUGGESTION mut
     b = Box::new(2);        //~ ERROR cannot assign twice to immutable variable `b`
                             //~| NOTE cannot assign twice to immutable
 }
 
 fn test_args(b: Box<i32>) {  //~ HELP consider making this binding mutable
-                                //~| SUGGESTION mut b
+                                //~| SUGGESTION mut
     b = Box::new(2);            //~ ERROR cannot assign to immutable argument `b`
                                 //~| NOTE cannot assign to immutable argument
 }
diff --git a/tests/ui/borrowck/issue-45199.stderr b/tests/ui/borrowck/issue-45199.stderr
@@ -9,7 +9,7 @@ LL |     b = Box::new(2);
 help: consider making this binding mutable
    |
 LL |     let mut b: Box<isize>;
-   |         ~~~~~
+   |         +++
 
 error[E0384]: cannot assign twice to immutable variable `b`
   --> $DIR/issue-45199.rs:14:5
@@ -23,7 +23,7 @@ LL |     b = Box::new(2);
 help: consider making this binding mutable
    |
 LL |     let mut b = Box::new(1);
-   |         ~~~~~
+   |         +++
 
 error[E0384]: cannot assign to immutable argument `b`
   --> $DIR/issue-45199.rs:20:5
@@ -34,7 +34,7 @@ LL |     b = Box::new(2);
 help: consider making this binding mutable
    |
 LL | fn test_args(mut b: Box<i32>) {
-   |              ~~~~~
+   |              +++
 
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/borrowck/suggest-ref-mut-issue-118596.stderr b/tests/ui/borrowck/suggest-ref-mut-issue-118596.stderr
@@ -9,11 +9,11 @@ LL |         x = 2;
 help: consider making this binding mutable
    |
 LL |     if let Some(mut x) = y {
-   |                 ~~~~~
+   |                 +++
 help: to modify the original value, take a borrow instead
    |
 LL |     if let Some(ref mut x) = y {
-   |                 ~~~~~~~~~
+   |                 +++++++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/suggest-ref-mut-issue-118596.rs:9:5
@@ -26,11 +26,11 @@ LL |     x = 0;
 help: consider making this binding mutable
    |
 LL |     let [mut x, ref xs_hold @ ..] = arr;
-   |          ~~~~~
+   |          +++
 help: to modify the original value, take a borrow instead
    |
 LL |     let [ref mut x, ref xs_hold @ ..] = arr;
-   |          ~~~~~~~~~
+   |          +++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/borrowck/tainted-promoteds.stderr b/tests/ui/borrowck/tainted-promoteds.stderr
@@ -9,7 +9,7 @@ LL |     a = &0 * &1 * &2 * &3;
 help: consider making this binding mutable
    |
 LL |     let mut a = 0;
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/command-line-diagnostics.stderr b/tests/ui/command-line-diagnostics.stderr
@@ -9,7 +9,7 @@ LL |     x = 43;
 help: consider making this binding mutable
    |
 LL |     let mut x = 42;
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr b/tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr
@@ -22,7 +22,7 @@ LL |     y = x.b;
 help: consider making this binding mutable
    |
 LL | fn foo(mut x: Ref, mut y: &u32) {
-   |                    ~~~~~
+   |                    +++
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr b/tests/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr
@@ -9,7 +9,7 @@ LL |         x = 3;
 help: consider making this binding mutable
    |
 LL |     let mut x;
-   |         ~~~~~
+   |         +++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/liveness-assign-imm-local-notes.rs:21:13
@@ -22,7 +22,7 @@ LL |             x = 3;
 help: consider making this binding mutable
    |
 LL |         let mut x;
-   |             ~~~~~
+   |             +++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/liveness-assign-imm-local-notes.rs:30:13
@@ -33,7 +33,7 @@ LL |             x = 1;
 help: consider making this binding mutable
    |
 LL |     let mut x;
-   |         ~~~~~
+   |         +++
 
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/liveness-assign-imm-local-notes.rs:32:13
@@ -47,7 +47,7 @@ LL |             x = 2;
 help: consider making this binding mutable
    |
 LL |     let mut x;
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 4 previous errors
 
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs
@@ -1,7 +1,7 @@
 fn test() {
     let v: isize;
     //~^ HELP consider making this binding mutable
-    //~| SUGGESTION mut v
+    //~| SUGGESTION mut
     loop {
         v = 1; //~ ERROR cannot assign twice to immutable variable `v`
                //~| NOTE cannot assign twice to immutable variable
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr
@@ -7,7 +7,7 @@ LL |         v = 1;
 help: consider making this binding mutable
    |
 LL |     let mut v: isize;
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs
@@ -1,7 +1,7 @@
 fn test() {
     let v: isize;
     //~^ HELP consider making this binding mutable
-    //~| SUGGESTION mut v
+    //~| SUGGESTION mut
     v = 2;  //~ NOTE first assignment
     v += 1; //~ ERROR cannot assign twice to immutable variable `v`
             //~| NOTE cannot assign twice to immutable
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr
@@ -9,7 +9,7 @@ LL |     v += 1;
 help: consider making this binding mutable
    |
 LL |     let mut v: isize;
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs
@@ -1,7 +1,7 @@
 fn test() {
     let b = Box::new(1); //~ NOTE first assignment
                          //~| HELP consider making this binding mutable
-                         //~| SUGGESTION mut b
+                         //~| SUGGESTION mut
     drop(b);
     b = Box::new(2); //~ ERROR cannot assign twice to immutable variable `b`
                      //~| NOTE cannot assign twice to immutable
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr
@@ -10,7 +10,7 @@ LL |     b = Box::new(2);
 help: consider making this binding mutable
    |
 LL |     let mut b = Box::new(1);
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs
@@ -1,7 +1,7 @@
 fn test() {
     let v: isize = 1; //~ NOTE first assignment
                       //~| HELP consider making this binding mutable
-                      //~| SUGGESTION mut v
+                      //~| SUGGESTION mut
     v.clone();
     v = 2; //~ ERROR cannot assign twice to immutable variable `v`
            //~| NOTE cannot assign twice to immutable
diff --git a/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr b/tests/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr
@@ -10,7 +10,7 @@ LL |     v = 2;
 help: consider making this binding mutable
    |
 LL |     let mut v: isize = 1;
-   |         ~~~~~
+   |         +++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/mut/mut-pattern-internal-mutability.stderr b/tests/ui/mut/mut-pattern-internal-mutability.stderr
@@ -9,11 +9,11 @@ LL |     x += 1;
 help: consider making this binding mutable
    |
 LL |     let &mut mut x = foo;
-   |              ~~~~~
+   |              +++
 help: to modify the original value, take a borrow instead
    |
 LL |     let &mut ref mut x = foo;
-   |              ~~~~~~~~~
+   |              +++++++
 
 error[E0506]: cannot assign to `*foo` because it is borrowed
   --> $DIR/mut-pattern-internal-mutability.rs:13:5
diff --git a/tests/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr b/tests/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr
@@ -78,11 +78,11 @@ LL |         | Err(a @ b @ a)
 help: consider making this binding mutable
    |
 LL |         Ok(a @ b @ mut a)
-   |                    ~~~~~
+   |                    +++
 help: to modify the original value, take a borrow instead
    |
 LL |         Ok(a @ b @ ref mut a)
-   |                    ~~~~~~~~~
+   |                    +++++++
 
 error: aborting due to 12 previous errors
 
diff --git a/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr b/tests/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr
diff --git a/tests/ui/pattern/mut-ref-mut-2021.stderr b/tests/ui/pattern/mut-ref-mut-2021.stderr

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ LL \| v = 2;`
`10`	`10`	`help: consider making this binding mutable`
`11`	`11`	`\|`
`12`	`12`	`LL \| let mut v: isize;`
`13`		`- \| ~~~~~`
	`13`	`+ \| +++`
`14`	`14`
`15`	`15`	`error: aborting due to 1 previous error`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ LL \| x += 1;`
`20`	`20`	`help: consider making this binding mutable`
`21`	`21`	`\|`
`22`	`22`	`LL \| pub async fn g(mut x: usize) {`
`23`		`- \| ~~~~~`
	`23`	`+ \| +++`
`24`	`24`
`25`	`25`	`error: aborting due to 2 previous errors`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| _x = 4;`
`7`	`7`	`help: consider making this binding mutable`
`8`	`8`	`\|`
`9`	`9`	`LL \| fn foo(mut _x: u32) {`
`10`		`- \| ~~~~~~`
	`10`	`+ \| +++`
`11`	`11`
`12`	`12`	`error: aborting due to 1 previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ LL \| x = 2;`
`9`	`9`	`help: consider making this binding mutable`
`10`	`10`	`\|`
`11`	`11`	`LL \| if let Some(mut x) = y {`
`12`		`- \| ~~~~~`
	`12`	`+ \| +++`
`13`	`13`	`help: to modify the original value, take a borrow instead`
`14`	`14`	`\|`
`15`	`15`	`LL \| if let Some(ref mut x) = y {`
`16`		`- \| ~~~~~~~~~`
	`16`	`+ \| +++++++`
`17`	`17`
`18`	`18`	error[E0384]: cannot assign twice to immutable variable `x`
`19`	`19`	`--> $DIR/suggest-ref-mut-issue-118596.rs:9:5`
`@@ -26,11 +26,11 @@ LL \| x = 0;`
`26`	`26`	`help: consider making this binding mutable`
`27`	`27`	`\|`
`28`	`28`	`LL \| let [mut x, ref xs_hold @ ..] = arr;`
`29`		`- \| ~~~~~`
	`29`	`+ \| +++`
`30`	`30`	`help: to modify the original value, take a borrow instead`
`31`	`31`	`\|`
`32`	`32`	`LL \| let [ref mut x, ref xs_hold @ ..] = arr;`
`33`		`- \| ~~~~~~~~~`
	`33`	`+ \| +++++++`
`34`	`34`
`35`	`35`	`error: aborting due to 2 previous errors`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ LL \| a = &0 * &1 * &2 * &3;`
`9`	`9`	`help: consider making this binding mutable`
`10`	`10`	`\|`
`11`	`11`	`LL \| let mut a = 0;`
`12`		`- \| ~~~~~`
	`12`	`+ \| +++`
`13`	`13`
`14`	`14`	`error: aborting due to 1 previous error`
`15`	`15`