---

yaml
---
r: 48627
b: refs/heads/snap-stage3
c: d55225f
h: refs/heads/master
i:
  48625: fd46555
  48623: c8562ad
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ad16fecc332e5dd39236f43c491c009ea798352b
+refs/heads/snap-stage3: d55225f04a459c574d9533dcc4c06f953fa8fce5
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/treemap.rs

@@ -1141,25 +1141,30 @@ mod test_set {
 
     #[test]
     fn test_difference() {
-        let mut a = TreeSet::new();
-        let mut b = TreeSet::new();
-
-        fail_unless!(a.insert(1));
-        fail_unless!(a.insert(3));
-        fail_unless!(a.insert(5));
-        fail_unless!(a.insert(9));
-        fail_unless!(a.insert(11));
+        fn check_difference(a: &[int], b: &[int], expected: &[int]) {
+            let mut set_a = TreeSet::new();
+            let mut set_b = TreeSet::new();
 
-        fail_unless!(b.insert(3));
-        fail_unless!(b.insert(9));
+            for a.each |x| { fail_unless!(set_a.insert(*x)) }
+            for b.each |y| { fail_unless!(set_b.insert(*y)) }
 
-        let mut i = 0;
-        let expected = [1, 5, 11];
-        for a.difference(&b) |x| {
-            fail_unless!(*x == expected[i]);
-            i += 1
+            let mut i = 0;
+            for set_a.difference(&set_b) |x| {
+                fail_unless!(*x == expected[i]);
+                i += 1;
+            }
+            fail_unless!(i == expected.len());
         }
-        fail_unless!(i == expected.len());
+
+        check_difference([], [], []);
+        check_difference([1, 12], [], [1, 12]);
+        check_difference([], [1, 2, 3, 9], []);
+        check_difference([1, 3, 5, 9, 11],
+                         [3, 9],
+                         [1, 5, 11]);
+        check_difference([-5, 11, 22, 33, 40, 42],
+                         [-12, -5, 14, 23, 34, 38, 39, 50],
+                         [11, 22, 33, 40, 42]);
     }
 
     #[test]