bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't suggest changing {ImmRef,MutRef} implicit self to be mutable

Browse source
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2023-05-27 21:25:25 +08:00
parent b9c5fdc888
commit 57e67e4ab2
No known key found for this signature in database
GPG key ID: C5FD5D32014FDB47
3 changed files with 79 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
View file

@ -416,12 +416,28 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
_,
) = pat.kind
{
err.span_suggestion(
upvar_ident.span,
"consider changing this to be mutable",
format!("mut {}", upvar_ident.name),
Applicability::MachineApplicable,
);
if upvar_ident.name == kw::SelfLower {
for (_, node) in self.infcx.tcx.hir().parent_iter(upvar_hir_id) {
if let Some(fn_decl) = node.fn_decl() {
if !matches!(fn_decl.implicit_self, hir::ImplicitSelfKind::ImmRef | hir::ImplicitSelfKind::MutRef) {
err.span_suggestion(
upvar_ident.span,
"consider changing this to be mutable",
format!("mut {}", upvar_ident.name),
Applicability::MachineApplicable,
);
break;
}
}
}
} else {
err.span_suggestion(
upvar_ident.span,
"consider changing this to be mutable",
format!("mut {}", upvar_ident.name),
Applicability::MachineApplicable,
);
}
}
let tcx = self.infcx.tcx;