tweak "make mut" spans (No. 3)

2023-04-19 19:50:08 +12:00
parent 9624d2b08e
commit 57c6a3183c
15 changed files with 43 additions and 39 deletions
--- a/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
+++ b/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
@@ -1263,6 +1263,10 @@ fn suggest_ampmut<'tcx>(
    {
        let span = span.with_lo(span.lo() + BytePos(ws_pos as u32)).shrink_to_lo();
        (true, span, " mut".to_owned())
+    } else if binding_exists {
+        // shrink the span to just after the `&` in `&variable`
+        let span = span.with_lo(span.lo() + BytePos(1)).shrink_to_lo();
+        (true, span, "mut ".to_owned())
    } else {
        let ty_mut = local_decl.ty.builtin_deref(true).unwrap();
        assert_eq!(ty_mut.mutbl, hir::Mutability::Not);