mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #126471 - oli-obk:filter_loop, r=compiler-errors

Browse Source 
Use a consistent way to filter out bounds instead of splitting it into three places

just a small cleanup, no logic change.

Initially the code had me looking for why anything was special here, only to realize there's nothing interesting going on
This commit is contained in:
Matthias Krüger 2024-06-15 10:56:42 +02:00 committed by GitHub
commit 6f21da3bb4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,24 +239,19 @@ fn assemble_candidates_from_caller_bounds<'o>(
return Ok(()); return Ok(());
} }
let all_bounds = stack let bounds = stack
.obligation .obligation
.param_env .param_env
.caller_bounds() .caller_bounds()
.iter() .iter()
.filter(|p| !p.references_error()) .filter(|p| !p.references_error())
.filter_map(|p| p.as_trait_clause()); .filter_map(|p| p.as_trait_clause())
// Micro-optimization: filter out predicates relating to different traits. // Micro-optimization: filter out predicates relating to different traits.
let matching_bounds = .filter(|p| p.def_id() == stack.obligation.predicate.def_id())
all_bounds.filter(|p| p.def_id() == stack.obligation.predicate.def_id()); .filter(|p| p.polarity() == stack.obligation.predicate.polarity());
// Keep only those bounds which may apply, and propagate overflow if it occurs. // Keep only those bounds which may apply, and propagate overflow if it occurs.
for bound in matching_bounds { for bound in bounds {
if bound.skip_binder().polarity != stack.obligation.predicate.skip_binder().polarity {
continue;
}
// FIXME(oli-obk): it is suspicious that we are dropping the constness and // FIXME(oli-obk): it is suspicious that we are dropping the constness and
// polarity here. // polarity here.
let wc = self.where_clause_may_apply(stack, bound.map_bound(|t| t.trait_ref))?; let wc = self.where_clause_may_apply(stack, bound.map_bound(|t| t.trait_ref))?;