auto merge of #8805 : jfager/rust/remove-hashutil, r=alexcrichton

diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs
index 336c07c9d6e9cc8eedfc64a0de69b848e14bda11..215f41f3fd647457daf38639ed39f95a1c253119 100644 (file)
--- a/src/librustc/metadata/decoder.rs
+++ b/src/librustc/metadata/decoder.rs
@@ -26,7 +26,6 @@
 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 790dff2886fa09f7e488f327efa93df1451e3548..aad9dd33d8df03a16230f1e9a21534d852b180c3 100644 (file)
--- a/src/librustc/metadata/encoder.rs
+++ b/src/librustc/metadata/encoder.rs
@@ -21,7 +21,6 @@
 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 21b7ee321e8db2a1aa63d7d7b56c74879b1dc445..6682a41097925bbcf60aaa00aa1b0d461f021ad7 100644 (file)
--- 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<A:Hash> 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 b17632e4ee7523fd3fc24a2418c9fea9a347b92a..85b8f55af6712292ad10429815f62c301ed4517f 100644 (file)
--- 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 2fa77ee16356bd8682143a0ae771d0ebf667d7af..04e0dbb6d0e931eb947e6fec7a7013c6ebb1a7b3 100644 (file)
--- 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