bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Suggest mutable borrows correctly

Browse source
This commit is contained in:
Michael Goulet 2023-01-25 19:17:46 +00:00
parent 800f1f3513
commit b83ab0ce96
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -3775,12 +3775,12 @@ fn hint_missing_borrow<'tcx>(
let args = fn_decl.inputs.iter().map(|ty| ty); let args = fn_decl.inputs.iter().map(|ty| ty);
fn get_deref_type_and_refs(mut ty: Ty<'_>) -> (Ty<'_>, usize) { fn get_deref_type_and_refs(mut ty: Ty<'_>) -> (Ty<'_>, Vec<hir::Mutability>) {
let mut refs = 0; let mut refs = vec![];
while let ty::Ref(_, new_ty, _) = ty.kind() { while let ty::Ref(_, new_ty, mutbl) = ty.kind() {
ty = *new_ty; ty = *new_ty;
refs += 1; refs.push(*mutbl);
} }
(ty, refs) (ty, refs)
@ -3794,11 +3794,21 @@ fn hint_missing_borrow<'tcx>(
let (expected_ty, expected_refs) = get_deref_type_and_refs(*expected_arg); let (expected_ty, expected_refs) = get_deref_type_and_refs(*expected_arg);
if infcx.can_eq(param_env, found_ty, expected_ty).is_ok() { if infcx.can_eq(param_env, found_ty, expected_ty).is_ok() {
if found_refs < expected_refs { // FIXME: This could handle more exotic cases like mutability mismatches too!
to_borrow.push((arg.span.shrink_to_lo(), "&".repeat(expected_refs - found_refs))); if found_refs.len() < expected_refs.len()
} else if found_refs > expected_refs { && found_refs[..] == expected_refs[expected_refs.len() - found_refs.len()..]
{
to_borrow.push((
arg.span.shrink_to_lo(),
expected_refs[..expected_refs.len() - found_refs.len()]
.iter()
.map(|mutbl| format!("&{}", mutbl.prefix_str()))
.collect::<Vec<_>>()
.join(""),
));
} else if found_refs.len() > expected_refs.len() {
let mut span = arg.span.shrink_to_lo(); let mut span = arg.span.shrink_to_lo();
let mut left = found_refs - expected_refs; let mut left = found_refs.len() - expected_refs.len();
let mut ty = arg; let mut ty = arg;
while let hir::TyKind::Ref(_, mut_ty) = &ty.kind && left > 0 { while let hir::TyKind::Ref(_, mut_ty) = &ty.kind && left > 0 {
span = span.with_hi(mut_ty.ty.span.lo()); span = span.with_hi(mut_ty.ty.span.lo());

4
tests/ui/suggestions/late-bound-in-borrow-closure-sugg.stderr
View file

@ -18,8 +18,8 @@ LL | pub fn set_closure(&mut self, function: impl Fn(&mut Trader) + 'a) {
| ^^^^^^^^^^^^^^^ required by this bound in `Trader::<'a>::set_closure` | ^^^^^^^^^^^^^^^ required by this bound in `Trader::<'a>::set_closure`
help: consider borrowing the argument help: consider borrowing the argument
| |
LL | let closure = |trader : &Trader| { LL | let closure = |trader : &mut Trader| {
| + | ++++
error: aborting due to previous error error: aborting due to previous error