rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Always check the lang item first

Browse Source
This commit is contained in:
Oli Scherer
2025-04-28 09:02:06 +00:00
parent 19fc3a1a6e
commit dd714276e5
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
View File

@@ -139,12 +139,14 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
&mut candidates, &mut candidates,
); );
} }
_ => { Some(LangItem::AsyncFn | LangItem::AsyncFnMut | LangItem::AsyncFnOnce) => {
// FIXME: Put these into match arms above, since they're built-in.
self.assemble_closure_candidates(obligation, &mut candidates);
self.assemble_async_closure_candidates(obligation, &mut candidates); self.assemble_async_closure_candidates(obligation, &mut candidates);
}
Some(LangItem::Fn | LangItem::FnMut | LangItem::FnOnce) => {
self.assemble_closure_candidates(obligation, &mut candidates);
self.assemble_fn_pointer_candidates(obligation, &mut candidates); self.assemble_fn_pointer_candidates(obligation, &mut candidates);
} }
_ => {}
} }
self.assemble_candidates_from_impls(obligation, &mut candidates); self.assemble_candidates_from_impls(obligation, &mut candidates);
@@ -380,9 +382,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
obligation: &PolyTraitObligation<'tcx>, obligation: &PolyTraitObligation<'tcx>,
candidates: &mut SelectionCandidateSet<'tcx>, candidates: &mut SelectionCandidateSet<'tcx>,
) { ) {
let Some(kind) = self.tcx().fn_trait_kind_from_def_id(obligation.predicate.def_id()) else { let kind = self.tcx().fn_trait_kind_from_def_id(obligation.predicate.def_id()).unwrap();
return;
};
// Okay to skip binder because the args on closure types never // Okay to skip binder because the args on closure types never
// touch bound regions, they just capture the in-scope // touch bound regions, they just capture the in-scope
@@ -444,11 +444,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
obligation: &PolyTraitObligation<'tcx>, obligation: &PolyTraitObligation<'tcx>,
candidates: &mut SelectionCandidateSet<'tcx>, candidates: &mut SelectionCandidateSet<'tcx>,
) { ) {
let Some(goal_kind) = let goal_kind =
self.tcx().async_fn_trait_kind_from_def_id(obligation.predicate.def_id()) self.tcx().async_fn_trait_kind_from_def_id(obligation.predicate.def_id()).unwrap();
else {
return;
};
match *obligation.self_ty().skip_binder().kind() { match *obligation.self_ty().skip_binder().kind() {
ty::CoroutineClosure(_, args) => { ty::CoroutineClosure(_, args) => {
@@ -521,11 +518,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
obligation: &PolyTraitObligation<'tcx>, obligation: &PolyTraitObligation<'tcx>,
candidates: &mut SelectionCandidateSet<'tcx>, candidates: &mut SelectionCandidateSet<'tcx>,
) { ) {
// We provide impl of all fn traits for fn pointers.
if !self.tcx().is_fn_trait(obligation.predicate.def_id()) {
return;
}
// Keep this function in sync with extract_tupled_inputs_and_output_from_callable // Keep this function in sync with extract_tupled_inputs_and_output_from_callable
// until the old solver (and thus this function) is removed. // until the old solver (and thus this function) is removed.