Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove usage of deprecated SipHasher.

Browse source
This commit is contained in:
Simon Sapin 2016-10-10 17:11:49 +02:00
parent 37340d0c26
commit 33c7915032
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/style/cache.rs
View file

@ -4,9 +4,8 @@
//! Two simple cache data structures.
use rand;
use rand::Rng;
use std::hash::{Hash, Hasher, SipHasher};
use std::collections::hash_map::RandomState;
use std::hash::{Hash, Hasher, BuildHasher};
use std::slice::{Iter, IterMut};
pub struct LRUCache<K, V> {
@ -72,17 +71,14 @@ impl<K: PartialEq, V: Clone> LRUCache<K, V> {
pub struct SimpleHashCache<K, V> {
entries: Vec<Option<(K, V)>>,
k0: u64,
k1: u64,
random: RandomState,
}
impl<K: Clone + Eq + Hash, V: Clone> SimpleHashCache<K, V> {
pub fn new(cache_size: usize) -> SimpleHashCache<K, V> {
let mut r = rand::thread_rng();
SimpleHashCache {
entries: vec![None; cache_size],
k0: r.gen(),
k1: r.gen(),
random: RandomState::new(),
}
}
@ -93,7 +89,7 @@ impl<K: Clone + Eq + Hash, V: Clone> SimpleHashCache<K, V> {
#[inline]
fn bucket_for_key<Q: Hash>(&self, key: &Q) -> usize {
let mut hasher = SipHasher::new_with_keys(self.k0, self.k1);
let mut hasher = self.random.build_hasher();
key.hash(&mut hasher);
self.to_bucket(hasher.finish() as usize)
}