auto merge of #12522 : erickt/rust/hash, r=alexcrichton

This patch series does a couple things:

* replaces manual `Hash` implementations with `#[deriving(Hash)]`
* adds `Hash` back to `std::prelude`
* minor cleanup of whitespace and variable names.

3 files changed, 1 insertions, 11 deletions

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index ac24a02c15b..d7b6ab25078 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -18,13 +18,12 @@ use str::OwnedStr;
 use container::Container;
 use cast;
 use fmt;
-use hash::{Hash, sip};
 use iter::Iterator;
 use vec::{ImmutableVector, MutableVector, Vector};
 use option::{Option, Some, None};
 
 /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero.
-#[deriving(Clone, Eq, Ord, TotalOrd, TotalEq)]
+#[deriving(Clone, Eq, Ord, TotalOrd, TotalEq, Hash)]
 pub struct Ascii { priv chr: u8 }
 
 impl Ascii {
@@ -306,13 +305,6 @@ impl IntoStr for ~[Ascii] {
     }
 }
 
-impl Hash for Ascii {
-    #[inline]
-    fn hash(&self, s: &mut sip::SipState) {
-        self.to_byte().hash(s)
-    }
-}
-
 /// Trait to convert to an owned byte array by consuming self
 pub trait IntoBytes {
     /// Converts to an owned byte array by consuming self
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index f67ba8fce03..d112b504c98 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -55,7 +55,6 @@ pub struct SocketAddr {
     port: Port,
 }
 
-
 impl fmt::Show for SocketAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.ip {
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index e96eedea5cb..d38daf68cbc 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -151,7 +151,6 @@ pub mod container;
 pub mod default;
 pub mod any;
 
-
 /* Common data structures */
 
 pub mod option;