bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move suggest_hoisting_call_outside_loop out of suggest_cloning

Browse source
This commit is contained in:
Esteban Küber 2024-03-17 21:52:12 +00:00
parent da2364d746
commit 3b237d7d8a
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View file

@ -463,7 +463,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
} else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } = move_spans } else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } = move_spans
{ {
// We already suggest cloning for these cases in `explain_captures`. // We already suggest cloning for these cases in `explain_captures`.
} else { } else if self.suggest_hoisting_call_outside_loop(err, expr) {
// The place where the the type moves would be misleading to suggest clone.
// #121466
self.suggest_cloning(err, ty, expr, move_span); self.suggest_cloning(err, ty, expr, move_span);
} }
} }
@ -977,11 +979,6 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
fn suggest_cloning(&self, err: &mut Diag<'_>, ty: Ty<'tcx>, expr: &hir::Expr<'_>, span: Span) { fn suggest_cloning(&self, err: &mut Diag<'_>, ty: Ty<'tcx>, expr: &hir::Expr<'_>, span: Span) {
let tcx = self.infcx.tcx; let tcx = self.infcx.tcx;
if !self.suggest_hoisting_call_outside_loop(err, expr) {
// The place where the the type moves would be misleading to suggest clone. (#121466)
return;
}
// Try to find predicates on *generic params* that would allow copying `ty` // Try to find predicates on *generic params* that would allow copying `ty`
let suggestion = let suggestion =
if let Some(symbol) = tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) { if let Some(symbol) = tcx.hir().maybe_get_struct_pattern_shorthand_field(expr) {