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

Return FxIndexSet instead of FxHashSet to avoid order errors on different platforms

Browse source
This commit is contained in:
Santiago Pastorino 2020-11-27 18:45:34 -03:00
parent 504d27cb0c
commit ada7c1f429
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_infer/src/traits/util.rs
View file

@ -1,7 +1,7 @@
use smallvec::smallvec; use smallvec::smallvec;
use crate::traits::{Obligation, ObligationCause, PredicateObligation}; use crate::traits::{Obligation, ObligationCause, PredicateObligation};
use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::fx::{FxHashSet, FxIndexSet};
use rustc_middle::ty::outlives::Component; use rustc_middle::ty::outlives::Component;
use rustc_middle::ty::{self, ToPredicate, TyCtxt, WithConstness}; use rustc_middle::ty::{self, ToPredicate, TyCtxt, WithConstness};
use rustc_span::symbol::Ident; use rustc_span::symbol::Ident;
@ -297,9 +297,9 @@ pub fn transitive_bounds_that_define_assoc_type<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
bounds: impl Iterator<Item = ty::PolyTraitRef<'tcx>>, bounds: impl Iterator<Item = ty::PolyTraitRef<'tcx>>,
assoc_name: Ident, assoc_name: Ident,
) -> FxHashSet<ty::PolyTraitRef<'tcx>> { ) -> FxIndexSet<ty::PolyTraitRef<'tcx>> {
let mut stack: Vec<_> = bounds.collect(); let mut stack: Vec<_> = bounds.collect();
let mut trait_refs = FxHashSet::default(); let mut trait_refs = FxIndexSet::default();
while let Some(trait_ref) = stack.pop() { while let Some(trait_ref) = stack.pop() {
if trait_refs.insert(trait_ref) { if trait_refs.insert(trait_ref) {