---

yaml
---
r: 212042
b: refs/heads/tmp
c: b700b37
h: refs/heads/master
v: v3

Author: Ms2ger

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 62e70d35be3fe532c26a400b499c58a18f18dd3a
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 37dd4174d56431e97adf06ecaf6395376ab2ebbc
+refs/heads/tmp: b700b37094a7215e4ac344f691b26c2e5fc81734
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: b77d60adb019bb5de05e884a99f3290ec4694137
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/librustc/metadata/decoder.rs

@@ -220,16 +220,8 @@ fn get_provided_source(d: rbml::Doc, cdata: Cmd) -> Option<ast::DefId> {
     })
 }
 
-fn each_reexport<F>(d: rbml::Doc, mut f: F) -> bool where
-    F: FnMut(rbml::Doc) -> bool,
-{
-    for doc in reader::tagged_docs(d, tag_items_data_item_reexport) {
-        if !f(doc) {
-            return false;
-        }
-    }
-
-    true
+fn reexports<'a>(d: rbml::Doc<'a>) -> reader::TaggedDocsIterator<'a> {
+    reader::tagged_docs(d, tag_items_data_item_reexport)
 }
 
 fn variant_disr_val(d: rbml::Doc) -> Option<ty::Disr> {
@@ -615,8 +607,7 @@ fn each_child_of_item_or_crate<F, G>(intr: Rc<IdentInterner>,
         }
     }
 
-    // Iterate over all reexports.
-    let _ = each_reexport(item_doc, |reexport_doc| {
+    for reexport_doc in reexports(item_doc) {
         let def_id_doc = reader::get_doc(reexport_doc,
                                          tag_items_data_item_reexport_def_id);
         let child_def_id = translated_def_id(cdata, def_id_doc);
@@ -646,9 +637,7 @@ fn each_child_of_item_or_crate<F, G>(intr: Rc<IdentInterner>,
             // a public re-export.
             callback(def_like, token::intern(name), ast::Public);
         }
-
-        true
-    });
+    }
 }
 
 /// Iterates over each child of the given item.