Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9523 - ruud-v-a:hasher, r=Wafflespeanut

Browse source 
Upgrade to new Hasher API

This fixes #9494.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9523)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-05 07:32:13 +05:30
commit 87aaa5ffe0
9 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/util/cache.rs
View file

@ -6,9 +6,8 @@ use rand;
use rand::Rng;
use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::collections::hash_state::DefaultState;
use std::default::Default;
use std::hash::{Hash, Hasher, SipHasher};
use std::hash::{BuildHasherDefault, Hash, Hasher, SipHasher};
use std::slice::Iter;
@ -17,7 +16,7 @@ pub struct HashCache<K, V>
where K: Clone + PartialEq + Eq + Hash,
V: Clone,
{
entries: HashMap<K, V, DefaultState<SipHasher>>,
entries: HashMap<K, V, BuildHasherDefault<SipHasher>>,
}
impl<K, V> HashCache<K, V>
@ -26,7 +25,7 @@ impl<K, V> HashCache<K, V>
{
pub fn new() -> HashCache<K, V> {
HashCache {
entries: HashMap::with_hash_state(<DefaultState<SipHasher> as Default>::default()),
entries: HashMap::with_hasher(Default::default()),
}
}

1
components/util/lib.rs
View file

@ -8,7 +8,6 @@
#![feature(custom_derive)]
#![cfg_attr(feature = "non-geckolib", feature(decode_utf16))]
#![feature(fnbox)]
#![feature(hashmap_hasher)]
#![feature(heap_api)]
#![feature(oom)]
#![feature(optin_builtin_traits)]