auto merge of #5256 : servo/servo/rustup_20150311, r=jdm

...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

1 files changed, 3 insertions, 3 deletions

diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs
index 38e7d898e97..88561210617 100644
--- a/components/script/dom/bindings/str.rs
+++ b/components/script/dom/bindings/str.rs
@@ -5,7 +5,7 @@
 //! The `ByteString` struct.
 
 use std::borrow::ToOwned;
-use std::hash::{Hash, SipHasher};
+use std::hash::{Hash, Hasher};
 use std::str;
 use std::str::FromStr;
 
@@ -144,8 +144,8 @@ impl ByteString {
     }
 }
 
-impl Hash<SipHasher> for ByteString {
-    fn hash(&self, state: &mut SipHasher) {
+impl Hash for ByteString {
+    fn hash<H: Hasher>(&self, state: &mut H) {
         let ByteString(ref vec) = *self;
         vec.hash(state);
     }