auto merge of #4874 : thestinger/rust/option, r=catamorphism

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs
index d3583828f9a..26bf232adf5 100644
--- a/src/libstd/treemap.rs
+++ b/src/libstd/treemap.rs
@@ -561,18 +561,18 @@ impl <K: Ord, V> TreeNode<K, V> {
 
 pure fn each<K: Ord, V>(node: &r/Option<~TreeNode<K, V>>,
                         f: fn(&(&r/K, &r/V)) -> bool) {
-    do node.map |x| {
+    do node.iter |x| {
         each(&x.left, f);
         if f(&(&x.key, &x.value)) { each(&x.right, f) }
-    };
+    }
 }
 
 pure fn each_reverse<K: Ord, V>(node: &r/Option<~TreeNode<K, V>>,
                                 f: fn(&(&r/K, &r/V)) -> bool) {
-    do node.map |x| {
+    do node.iter |x| {
         each_reverse(&x.right, f);
         if f(&(&x.key, &x.value)) { each_reverse(&x.left, f) }
-    };
+    }
 }
 
 // Remove left horizontal link by rotating right