---

yaml
---
r: 125939
b: refs/heads/try
c: fadbc0b
h: refs/heads/master
i:
  125937: 1797b06
  125935: 5769884
v: v3

Author: nham

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: 3f1c37e96da571e6eb8137aad1b5d65ea3f89a0b
+refs/heads/try: fadbc0b88bb39ac42aa4874e4a90df53a778ef59
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcollections/smallintmap.rs

@@ -24,6 +24,8 @@ use core::mem::replace;
 use {Collection, Mutable, Map, MutableMap, MutableSeq};
 use {vec, slice};
 use vec::Vec;
+use hash;
+use hash::Hash;
 
 /// A map optimized for small integer keys.
 ///
@@ -58,7 +60,7 @@ use vec::Vec;
 /// months.clear();
 /// assert!(months.is_empty());
 /// ```
-#[deriving(Hash, PartialEq, Eq)]
+#[deriving(PartialEq, Eq)]
 pub struct SmallIntMap<T> {
     v: Vec<Option<T>>,
 }
@@ -167,6 +169,12 @@ impl<V:Clone> Clone for SmallIntMap<V> {
     }
 }
 
+impl <S: hash::Writer, T: Hash<S>> Hash<S> for SmallIntMap<T> {
+    fn hash(&self, state: &mut S) {
+        self.v.hash(state)
+    }
+}
+
 impl<V> SmallIntMap<V> {
     /// Create an empty SmallIntMap.
     ///
@@ -478,8 +486,8 @@ pub type Values<'a, T> =
 #[cfg(test)]
 mod test_map {
     use std::prelude::*;
-    use std::hash;
     use vec::Vec;
+    use hash;
 
     use {Map, MutableMap, Mutable, MutableSeq};
     use super::SmallIntMap;
@@ -764,19 +772,19 @@ mod test_map {
 
     #[test]
     fn test_hash() {
-      let mut x = SmallIntMap::new();
-      let mut y = SmallIntMap::new();
+        let mut x = SmallIntMap::new();
+        let mut y = SmallIntMap::new();
 
-      assert!(hash::hash(&x) == hash::hash(&y));
-      x.insert(1, 'a');
-      x.insert(2, 'b');
-      x.insert(3, 'c');
+        assert!(hash::hash(&x) == hash::hash(&y));
+        x.insert(1, 'a');
+        x.insert(2, 'b');
+        x.insert(3, 'c');
 
-      y.insert(3, 'c');
-      y.insert(2, 'b');
-      y.insert(1, 'a');
+        y.insert(3, 'c');
+        y.insert(2, 'b');
+        y.insert(1, 'a');
 
-      assert!(hash::hash(&x) == hash::hash(&y));
+        assert!(hash::hash(&x) == hash::hash(&y));
     }
 
     #[test]