bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Deduplicate projection sub-obligations

Browse source
This commit is contained in:
Aaron Hill 2021-10-30 14:14:28 -05:00
parent 9f13083542
commit 67da0ff296
No known key found for this signature in database
GPG key ID: B4087E510E98B164
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_trait_selection/src/traits/project.rs
View file

@ -20,6 +20,7 @@ use super::{Normalized, NormalizedTy, ProjectionCacheEntry, ProjectionCacheKey};
use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
use crate::infer::{InferCtxt, InferOk, LateBoundRegionConversionTime};
use crate::traits::error_reporting::InferCtxtExt as _;
use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::stack::ensure_sufficient_stack;
use rustc_errors::ErrorReported;
use rustc_hir::def_id::DefId;
@ -944,6 +945,11 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
Normalized { value: projected_ty, obligations: projected_obligations }
};
let mut deduped: FxHashSet<_> = Default::default();
result
.obligations
.drain_filter(|sub_obligation| !deduped.insert(sub_obligation.clone()));
let mut canonical =
SelectionContext::with_query_mode(selcx.infcx(), TraitQueryMode::Canonical);
result.obligations.drain_filter(|projected_obligation| {