---

thestinger · thestinger · commit 8b09abf20a84 · 2013-03-11T22:36:23.000-04:00
yaml --- r: 51300 b: refs/heads/incoming c: 9b1a9ec h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 2889a8a4e5a490cf650d3730bc05a1694a1d3310
+refs/heads/incoming: 9b1a9ec4ea87d3ff25ecf361c78c6119590d62a9
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libstd/treemap.rs b/branches/incoming/src/libstd/treemap.rs
@@ -486,6 +486,9 @@ impl<T: TotalOrd> Set<T> for TreeSet<T> {
                     a = set_next(&mut x);
                 }
             }
+            do b.while_some |b1| {
+                if f(b1) { set_next(&mut y) } else { None }
+            }
         }
     }
 }
@@ -1182,6 +1185,7 @@ mod test_set {
 
         check_union([], [], []);
         check_union([1, 2, 3], [2], [1, 2, 3]);
+        check_union([2], [1, 2, 3], [1, 2, 3]);
         check_union([1, 3, 5, 9, 11, 16, 19, 24],
                     [-2, 1, 5, 9, 13, 19],
                     [-2, 1, 3, 5, 9, 11, 13, 16, 19, 24]);

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,9 @@ impl<T: TotalOrd> Set<T> for TreeSet<T> {`
`486`	`486`	`a = set_next(&mut x);`
`487`	`487`	`}`
`488`	`488`	`}`
	`489`	`+ do b.while_some \|b1\| {`
	`490`	`+ if f(b1) { set_next(&mut y) } else { None }`
	`491`	`+ }`
`489`	`492`	`}`
`490`	`493`	`}`
`491`	`494`	`}`
`@@ -1182,6 +1185,7 @@ mod test_set {`
`1182`	`1185`
`1183`	`1186`	`check_union([], [], []);`
`1184`	`1187`	`check_union([1, 2, 3], [2], [1, 2, 3]);`
	`1188`	`+ check_union([2], [1, 2, 3], [1, 2, 3]);`
`1185`	`1189`	`check_union([1, 3, 5, 9, 11, 16, 19, 24],`
`1186`	`1190`	`[-2, 1, 5, 9, 13, 19],`
`1187`	`1191`	`[-2, 1, 3, 5, 9, 11, 13, 16, 19, 24]);`