Skip to content

Commit 4d003bd

Browse files
Ms2gerXMPPwocky
authored andcommitted
Return a TaggedDocsIterator from each_reexport.
1 parent e2580f1 commit 4d003bd

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

src/librustc/metadata/decoder.rs

+4-15
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,8 @@ fn get_provided_source(d: rbml::Doc, cdata: Cmd) -> Option<ast::DefId> {
219219
})
220220
}
221221

222-
fn each_reexport<F>(d: rbml::Doc, mut f: F) -> bool where
223-
F: FnMut(rbml::Doc) -> bool,
224-
{
225-
for doc in reader::tagged_docs(d, tag_items_data_item_reexport) {
226-
if !f(doc) {
227-
return false;
228-
}
229-
}
230-
231-
true
222+
fn reexports<'a>(d: rbml::Doc<'a>) -> reader::TaggedDocsIterator<'a> {
223+
reader::tagged_docs(d, tag_items_data_item_reexport)
232224
}
233225

234226
fn variant_disr_val(d: rbml::Doc) -> Option<ty::Disr> {
@@ -609,8 +601,7 @@ fn each_child_of_item_or_crate<F, G>(intr: Rc<IdentInterner>,
609601
}
610602
}
611603

612-
// Iterate over all reexports.
613-
let _ = each_reexport(item_doc, |reexport_doc| {
604+
for reexport_doc in reexports(item_doc) {
614605
let def_id_doc = reader::get_doc(reexport_doc,
615606
tag_items_data_item_reexport_def_id);
616607
let child_def_id = translated_def_id(cdata, def_id_doc);
@@ -640,9 +631,7 @@ fn each_child_of_item_or_crate<F, G>(intr: Rc<IdentInterner>,
640631
// a public re-export.
641632
callback(def_like, token::intern(name), ast::Public);
642633
}
643-
644-
true
645-
});
634+
}
646635
}
647636

648637
/// Iterates over each child of the given item.

0 commit comments

Comments
 (0)