bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use type_implements_trait

Browse source
This commit is contained in:
Esteban Küber 2022-11-03 11:06:25 -07:00
parent 4f2f59ba6f
commit 14a3d572e6
1 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -715,28 +715,13 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
fn suggest_cloning(&self, err: &mut Diagnostic, ty: Ty<'tcx>, span: Span) { fn suggest_cloning(&self, err: &mut Diagnostic, ty: Ty<'tcx>, span: Span) {
let tcx = self.infcx.tcx; let tcx = self.infcx.tcx;
// 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 infcx = tcx.infer_ctxt().build(); let infcx = tcx.infer_ctxt().build();
let mut fulfill_cx = <dyn rustc_infer::traits::TraitEngine<'_>>::new(infcx.tcx); let clone_did = tcx.lang_items().clone_trait().unwrap();
let params = ty::List::empty();
let clone_did = infcx.tcx.lang_items().clone_trait().unwrap(); let ty = tcx.erase_regions(ty);
let cause = ObligationCause::new( let env = self.param_env;
span, if infcx.type_implements_trait(clone_did, ty, params, env).must_apply_modulo_regions() {
self.mir_hir_id(),
rustc_infer::traits::ObligationCauseCode::MiscObligation,
);
fulfill_cx.register_bound(
&infcx,
self.param_env,
// Erase any region vids from the type, which may not be resolved
infcx.tcx.erase_regions(ty),
clone_did,
cause,
);
// Select all, including ambiguous predicates
let errors = fulfill_cx.select_all_or_error(&infcx);
if errors.is_empty() {
err.span_suggestion_verbose( err.span_suggestion_verbose(
span.shrink_to_hi(), span.shrink_to_hi(),
"consider cloning the value if the performance cost is acceptable", "consider cloning the value if the performance cost is acceptable",