bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #88771 - jackh726:wf_tys_set, r=nikomatsakis

Browse source 
Use FxHashSet instead of Vec for well formed tys

Trying to recover perf from #88312

r? `@ghost`
This commit is contained in:
bors 2021-09-12 10:32:55 +00:00
commit 9ef27bf7dc
7 changed files with 40 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_borrowck/src/type_check/free_region_relations.rs
View file

@ -259,7 +259,7 @@ impl UniversalRegionRelationsBuilder<'cx, 'tcx> {
// We add implied bounds from both the unnormalized and normalized ty
// See issue #87748
let constraints_implied_1 = self.add_implied_bounds(ty);
let TypeOpOutput { output: ty, constraints: constraints1, .. } = self
let TypeOpOutput { output: norm_ty, constraints: constraints1, .. } = self
.param_env
.and(type_op::normalize::Normalize::new(ty))
.fully_perform(self.infcx)
@ -286,8 +286,9 @@ impl UniversalRegionRelationsBuilder<'cx, 'tcx> {
// }
// ```
// Both &Self::Bar and &() are WF
let constraints_implied_2 = self.add_implied_bounds(ty);
normalized_inputs_and_output.push(ty);
let constraints_implied_2 =
if ty != norm_ty { self.add_implied_bounds(norm_ty) } else { None };
normalized_inputs_and_output.push(norm_ty);
constraints1.into_iter().chain(constraints_implied_1).chain(constraints_implied_2)
})
.collect();