Skip to content

Commit 67da0ff

Browse files
committed
Deduplicate projection sub-obligations
1 parent 9f13083 commit 67da0ff

File tree

1 file changed

+6
-0
lines changed
  • compiler/rustc_trait_selection/src/traits

1 file changed

+6
-0
lines changed

compiler/rustc_trait_selection/src/traits/project.rs

+6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use super::{Normalized, NormalizedTy, ProjectionCacheEntry, ProjectionCacheKey};
2020
use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
2121
use crate::infer::{InferCtxt, InferOk, LateBoundRegionConversionTime};
2222
use crate::traits::error_reporting::InferCtxtExt as _;
23+
use rustc_data_structures::fx::FxHashSet;
2324
use rustc_data_structures::stack::ensure_sufficient_stack;
2425
use rustc_errors::ErrorReported;
2526
use rustc_hir::def_id::DefId;
@@ -944,6 +945,11 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
944945
Normalized { value: projected_ty, obligations: projected_obligations }
945946
};
946947

948+
let mut deduped: FxHashSet<_> = Default::default();
949+
result
950+
.obligations
951+
.drain_filter(|sub_obligation| !deduped.insert(sub_obligation.clone()));
952+
947953
let mut canonical =
948954
SelectionContext::with_query_mode(selcx.infcx(), TraitQueryMode::Canonical);
949955
result.obligations.drain_filter(|projected_obligation| {

0 commit comments

Comments
 (0)