Fix &mut removal suggestion

estebank · estebank · commit 7852986f9ade · 2024-07-03T21:02:55.000Z
diff --git a/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs b/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
@@ -450,7 +450,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, '_, 'infcx, 'tcx> {
             {
                 err.span_label(span, format!("cannot {act}"));
                 err.span_suggestion(
-                    span,
+                    span.with_hi(span.lo() + BytePos(5)),
                     "try removing `&mut` here",
                     "",
                     Applicability::MaybeIncorrect,
diff --git a/tests/ui/borrowck/issue-33819.stderr b/tests/ui/borrowck/issue-33819.stderr
@@ -7,7 +7,7 @@ LL |         Some(ref v) => { let a = &mut v; },
 help: try removing `&mut` here
    |
 LL -         Some(ref v) => { let a = &mut v; },
-LL +         Some(ref v) => { let a = ; },
+LL +         Some(ref v) => { let a = v; },
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/did_you_mean/issue-34337.stderr b/tests/ui/did_you_mean/issue-34337.stderr
@@ -7,7 +7,7 @@ LL |     get(&mut key);
 help: try removing `&mut` here
    |
 LL -     get(&mut key);
-LL +     get();
+LL +     get(key);
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/did_you_mean/issue-37139.stderr b/tests/ui/did_you_mean/issue-37139.stderr
@@ -7,7 +7,7 @@ LL |             test(&mut x);
 help: try removing `&mut` here
    |
 LL -             test(&mut x);
-LL +             test();
+LL +             test(x);
    |
 
 error: aborting due to 1 previous error

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, '_, 'infcx, 'tcx> {`
`450`	`450`	`{`
`451`	`451`	`err.span_label(span, format!("cannot {act}"));`
`452`	`452`	`err.span_suggestion(`
`453`		`- span,`
	`453`	`+ span.with_hi(span.lo() + BytePos(5)),`
`454`	`454`	"try removing `&mut` here",
`455`	`455`	`"",`
`456`	`456`	`Applicability::MaybeIncorrect,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| Some(ref v) => { let a = &mut v; },`
`7`	`7`	help: try removing `&mut` here
`8`	`8`	`\|`
`9`	`9`	`LL - Some(ref v) => { let a = &mut v; },`
`10`		`-LL + Some(ref v) => { let a = ; },`
	`10`	`+LL + Some(ref v) => { let a = v; },`
`11`	`11`	`\|`
`12`	`12`
`13`	`13`	`error: aborting due to 1 previous error`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| get(&mut key);`
`7`	`7`	help: try removing `&mut` here
`8`	`8`	`\|`
`9`	`9`	`LL - get(&mut key);`
`10`		`-LL + get();`
	`10`	`+LL + get(key);`
`11`	`11`	`\|`
`12`	`12`
`13`	`13`	`error: aborting due to 1 previous error`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| test(&mut x);`
`7`	`7`	help: try removing `&mut` here
`8`	`8`	`\|`
`9`	`9`	`LL - test(&mut x);`
`10`		`-LL + test();`
	`10`	`+LL + test(x);`
`11`	`11`	`\|`
`12`	`12`
`13`	`13`	`error: aborting due to 1 previous error`