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

Remove sort from hashing hashset, treeset and treemap

Browse Source
This commit is contained in:
Jakub Beránek 2021-12-13 09:19:59 +01:00
parent 6e33d3ecc2
commit ac08f13948
No known key found for this signature in database
GPG Key ID: DBC553E540C2F619
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
compiler/rustc_data_structures/src/stable_hasher.rs
View File

@ -503,13 +503,17 @@ impl_stable_hash_via_hash!(::std::path::PathBuf);
impl<K, V, R, HCX> HashStable<HCX> for ::std::collections::HashMap<K, V, R> impl<K, V, R, HCX> HashStable<HCX> for ::std::collections::HashMap<K, V, R>
where where
K: HashStable<HCX> + ToStableHashKey<HCX> + Eq, K: ToStableHashKey<HCX> + Eq,
V: HashStable<HCX>, V: HashStable<HCX>,
R: BuildHasher, R: BuildHasher,
{ {
#[inline] #[inline]
fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) { fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) {
hash_stable_hashmap(hcx, hasher, self, ToStableHashKey::to_stable_hash_key); stable_hash_reduce(hcx, hasher, self.iter(), self.len(), |hasher, hcx, (key, value)| {
let key = key.to_stable_hash_key(hcx);
key.hash_stable(hcx, hasher);
value.hash_stable(hcx, hasher);
});
} }
} }
@ -519,9 +523,10 @@ where
R: BuildHasher, R: BuildHasher,
{ {
fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) { fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) {
let mut keys: Vec<_> = self.iter().map(|k| k.to_stable_hash_key(hcx)).collect(); stable_hash_reduce(hcx, hasher, self.iter(), self.len(), |hasher, hcx, key| {
keys.sort_unstable(); let key = key.to_stable_hash_key(hcx);
keys.hash_stable(hcx, hasher); key.hash_stable(hcx, hasher);
});
} }
} }
@ -531,10 +536,11 @@ where
V: HashStable<HCX>, V: HashStable<HCX>,
{ {
fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) { fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) {
let mut entries: Vec<_> = stable_hash_reduce(hcx, hasher, self.iter(), self.len(), |hasher, hcx, (key, value)| {
self.iter().map(|(k, v)| (k.to_stable_hash_key(hcx), v)).collect(); let key = key.to_stable_hash_key(hcx);
entries.sort_unstable_by(|&(ref sk1, _), &(ref sk2, _)| sk1.cmp(sk2)); key.hash_stable(hcx, hasher);
entries.hash_stable(hcx, hasher); value.hash_stable(hcx, hasher);
});
} }
} }
@ -543,34 +549,30 @@ where
K: ToStableHashKey<HCX>, K: ToStableHashKey<HCX>,
{ {
fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) { fn hash_stable(&self, hcx: &mut HCX, hasher: &mut StableHasher) {
let mut keys: Vec<_> = self.iter().map(|k| k.to_stable_hash_key(hcx)).collect(); stable_hash_reduce(hcx, hasher, self.iter(), self.len(), |hasher, hcx, key| {
keys.sort_unstable(); let key = key.to_stable_hash_key(hcx);
keys.hash_stable(hcx, hasher); key.hash_stable(hcx, hasher);
});
} }
} }
pub fn hash_stable_hashmap<HCX, K, V, R, SK, F>( fn stable_hash_reduce<HCX, I, C, F>(
hcx: &mut HCX, hcx: &mut HCX,
hasher: &mut StableHasher, hasher: &mut StableHasher,
map: &::std::collections::HashMap<K, V, R>, collection: C,
to_stable_hash_key: F, length: usize,
hash_function: F,
) where ) where
K: Eq + HashStable<HCX>, C: Iterator<Item = I>,
V: HashStable<HCX>, F: Fn(&mut StableHasher, &mut HCX, I),
R: BuildHasher,
SK: HashStable<HCX> + Ord,
F: Fn(&K, &HCX) -> SK,
{ {
let hash = map let hash = collection
.iter() .map(|value| {
.map(|(key, value)| {
let key = to_stable_hash_key(key, hcx);
let mut hasher = StableHasher::new(); let mut hasher = StableHasher::new();
key.hash_stable(hcx, &mut hasher); hash_function(&mut hasher, hcx, value);
value.hash_stable(hcx, &mut hasher);
hasher.finish::<u128>() hasher.finish::<u128>()
}) })
.reduce(|accum, value| accum.wrapping_add(value)); .reduce(|accum, value| accum.wrapping_add(value));
map.len().hash_stable(hcx, hasher); length.hash_stable(hcx, hasher);
hash.hash_stable(hcx, hasher); hash.hash_stable(hcx, hasher);
} }