diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2016-01-29 02:03:50 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2016-02-01 17:55:36 +0100 |
| commit | 436b952298cfd099267d405941dac7859b02f2d6 (patch) | |
| tree | c955992fbbcecace2f0f3a3038aa05c5c53391c0 /components/script/dom | |
| parent | e7371b36dd0d3142e65fa54f87e023671c509e35 (diff) | |
| download | servo-436b952298cfd099267d405941dac7859b02f2d6.tar.gz servo-436b952298cfd099267d405941dac7859b02f2d6.zip | |
Bump Rust to 2016-01-31 nightly
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index dec38c26565..e62bd5d9583 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -71,10 +71,9 @@ use serde::{Deserialize, Serialize}; use smallvec::SmallVec; use std::boxed::FnBox; use std::cell::{Cell, UnsafeCell}; -use std::collections::hash_state::HashState; use std::collections::{HashMap, HashSet}; use std::ffi::CString; -use std::hash::{Hash, Hasher}; +use std::hash::{BuildHasher, Hash}; use std::intrinsics::return_address; use std::iter::{FromIterator, IntoIterator}; use std::mem; @@ -235,8 +234,7 @@ impl<T: JSTraceable, U: JSTraceable> JSTraceable for Result<T, U> { impl<K, V, S> JSTraceable for HashMap<K, V, S> where K: Hash + Eq + JSTraceable, V: JSTraceable, - S: HashState, - <S as HashState>::Hasher: Hasher, + S: BuildHasher { #[inline] fn trace(&self, trc: *mut JSTracer) { |