---

yaml
---
r: 125938
b: refs/heads/try
c: 3f1c37e
h: refs/heads/master
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: 1e997d62b7dc91779ace53cf18e31bc955a334f0
+refs/heads/try: 3f1c37e96da571e6eb8137aad1b5d65ea3f89a0b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcollections/smallintmap.rs

@@ -24,7 +24,6 @@ use core::mem::replace;
 use {Collection, Mutable, Map, MutableMap, MutableSeq};
 use {vec, slice};
 use vec::Vec;
-use hash::Hash;
 
 /// A map optimized for small integer keys.
 ///
@@ -59,7 +58,7 @@ use hash::Hash;
 /// months.clear();
 /// assert!(months.is_empty());
 /// ```
-#[deriving(PartialEq, Eq, Hash)]
+#[deriving(Hash, PartialEq, Eq)]
 pub struct SmallIntMap<T> {
     v: Vec<Option<T>>,
 }
@@ -480,8 +479,9 @@ pub type Values<'a, T> =
 mod test_map {
     use std::prelude::*;
     use std::hash;
+    use vec::Vec;
 
-    use {Map, MutableMap, Mutable};
+    use {Map, MutableMap, Mutable, MutableSeq};
     use super::SmallIntMap;
 
     #[test]
@@ -737,9 +737,9 @@ mod test_map {
     fn test_clone() {
         let mut a = SmallIntMap::new();
 
-        a.insert(1, vec!(4i, 5, 6));
-        a.insert(4, vec!());
-        a.insert(6, vec!(1, 3));
+        a.insert(1, 'x');
+        a.insert(4, 'y');
+        a.insert(6, 'z');
 
         assert!(a.clone() == a);
     }
@@ -781,7 +781,7 @@ mod test_map {
 
     #[test]
     fn test_from_iter() {
-        let xs = vec![(1u, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e'), (6, 'f')];
+        let xs: Vec<(uint, char)> = vec![(1u, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e')];
 
         let map: SmallIntMap<char> = xs.iter().map(|&x| x).collect();
 

branches/try/src/libcollections/trie.rs

@@ -1329,7 +1329,7 @@ mod test_map {
     #[test]
     fn test_show() {
         let mut map = TrieMap::new();
-        let empty = TrieMap::new();
+        let empty: TrieMap<uint> = TrieMap::new();
 
         map.insert(1, 'a');
         map.insert(2, 'b');