diff options
| author | bors <bors@rust-lang.org> | 2024-04-06 06:36:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-06 06:36:42 +0000 |
| commit | 8d490e33ad7bbcdeab7975be787653b1e46e48e4 (patch) | |
| tree | 74f75f196d83b316885ccaeb2d52a550588ac614 /compiler | |
| parent | 23d47dba319331d4418827cfbb8c1af283497d3c (diff) | |
| parent | 43dae6934153693be62902fcefed0f97b4ca892f (diff) | |
| download | rust-8d490e33ad7bbcdeab7975be787653b1e46e48e4.tar.gz rust-8d490e33ad7bbcdeab7975be787653b1e46e48e4.zip | |
Auto merge of #123471 - compiler-errors:match_projection_projections, r=oli-obk
Check def id before calling `match_projection_projections` When I "inlined" `assemble_candidates_from_predicates` into `for_each_item_bound` in #120584, I forgot to copy over the check that actually made sure the def id of the candidate was equal to the def id of the obligation. This means that we normalize goal a bit too often even if it's not productive to do so. This PR adds that def id check back. Fixes #123448
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/project.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/project.rs b/compiler/rustc_trait_selection/src/traits/project.rs index 9246a41a2bc..56b25b0fe6c 100644 --- a/compiler/rustc_trait_selection/src/traits/project.rs +++ b/compiler/rustc_trait_selection/src/traits/project.rs @@ -793,6 +793,9 @@ fn assemble_candidates_from_trait_def<'cx, 'tcx>( let Some(clause) = clause.as_projection_clause() else { return ControlFlow::Continue(()); }; + if clause.projection_def_id() != obligation.predicate.def_id { + return ControlFlow::Continue(()); + } let is_match = selcx.infcx.probe(|_| selcx.match_projection_projections(obligation, clause, true)); |
