nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweak "make mut" spans (No. 4)

Browse Source
This commit is contained in:
Ezra Shaw 2023-04-19 20:00:49 +12:00 committed by Ezra Shaw
parent 57c6a3183c
commit 336a6569f5
No known key found for this signature in database
GPG Key ID: 5156CF5845150B0D
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
View File

@ -1263,21 +1263,21 @@ fn suggest_ampmut<'tcx>(
{ {
let span = span.with_lo(span.lo() + BytePos(ws_pos as u32)).shrink_to_lo(); let span = span.with_lo(span.lo() + BytePos(ws_pos as u32)).shrink_to_lo();
(true, span, " mut".to_owned()) (true, span, " mut".to_owned())
// if there is already a binding, we modify it to be `mut`
} else if binding_exists { } else if binding_exists {
// shrink the span to just after the `&` in `&variable` // shrink the span to just after the `&` in `&variable`
let span = span.with_lo(span.lo() + BytePos(1)).shrink_to_lo(); let span = span.with_lo(span.lo() + BytePos(1)).shrink_to_lo();
(true, span, "mut ".to_owned()) (true, span, "mut ".to_owned())
// otherwise, suggest that the user annotates the binding; we provide the
// type of the local.
} else { } else {
let ty_mut = local_decl.ty.builtin_deref(true).unwrap(); let ty_mut = local_decl.ty.builtin_deref(true).unwrap();
assert_eq!(ty_mut.mutbl, hir::Mutability::Not); assert_eq!(ty_mut.mutbl, hir::Mutability::Not);
( (
binding_exists, false,
span, span,
if local_decl.ty.is_ref() { format!("{}mut {}", if local_decl.ty.is_ref() {"&"} else {"*"}, ty_mut.ty)
format!("&mut {}", ty_mut.ty)
} else {
format!("*mut {}", ty_mut.ty)
},
) )
} }
} }