auto merge of #5901 : thestinger/rust/iterator, r=sanxiyn

Can now use them like `x.transform(|i| i + 3).zip(y.filter(|i| i % 2)`.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs
index bc8cbaa0825..ac887c7fdc4 100644
--- a/src/libstd/treemap.rs
+++ b/src/libstd/treemap.rs
@@ -996,7 +996,7 @@ mod test_treemap {
                         (&x5, &y5)];
         let mut i = 0;
 
-        for advance(&mut b) |x| {
+        for b.advance |x| {
             assert!(expected[i] == x);
             i += 1;
 
@@ -1005,7 +1005,7 @@ mod test_treemap {
             }
         }
 
-        for advance(&mut b) |x| {
+        for b.advance |x| {
             assert!(expected[i] == x);
             i += 1;
         }
@@ -1209,7 +1209,7 @@ mod test_set {
 
         let x = x;
         let y = y;
-        let mut z = ZipIterator::new(x.iter(), y.iter());
+        let mut z = x.iter().zip(y.iter());
 
         // FIXME: #5801: this needs a type hint to compile...
         let result: Option<(&uint, & &'static str)> = z.next();