diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index 336c07c9d6e..215f41f3fd6 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -26,7 +26,6 @@ use middle::typeck; use middle::astencode::vtable_decoder_helpers; -use std::hash::HashUtil; use std::u64; use std::io::WriterUtil; use std::io; diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index 790dff2886f..aad9dd33d8d 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -21,7 +21,6 @@ use middle::typeck; use middle::astencode; use middle; -use std::hash::HashUtil; use std::hashmap::{HashMap, HashSet}; use std::io; use std::str; diff --git a/src/libstd/hash.rs b/src/libstd/hash.rs index 21b7ee321e8..6682a410979 100644 --- a/src/libstd/hash.rs +++ b/src/libstd/hash.rs @@ -59,14 +59,7 @@ pub trait Hash { * IterBytes trait, that feeds SipHash. */ fn hash_keyed(&self, k0: u64, k1: u64) -> u64; -} -// When we have default methods, won't need this. -pub trait HashUtil { - fn hash(&self) -> u64; -} - -impl HashUtil for A { #[inline] fn hash(&self) -> u64 { self.hash_keyed(0,0) } } diff --git a/src/test/run-pass/deriving-meta-multiple.rs b/src/test/run-pass/deriving-meta-multiple.rs index b17632e4ee7..85b8f55af67 100644 --- a/src/test/run-pass/deriving-meta-multiple.rs +++ b/src/test/run-pass/deriving-meta-multiple.rs @@ -19,8 +19,6 @@ struct Foo { } pub fn main() { - use std::hash::HashUtil; // necessary for IterBytes check - let a = Foo {bar: 4, baz: -3}; a == a; // check for Eq impl w/o testing its correctness diff --git a/src/test/run-pass/deriving-meta.rs b/src/test/run-pass/deriving-meta.rs index 2fa77ee1635..04e0dbb6d0e 100644 --- a/src/test/run-pass/deriving-meta.rs +++ b/src/test/run-pass/deriving-meta.rs @@ -17,8 +17,6 @@ struct Foo { } pub fn main() { - use std::hash::HashUtil; // necessary for IterBytes check - let a = Foo {bar: 4, baz: -3}; a == a; // check for Eq impl w/o testing its correctness