Skip to content

Return an iterator from enum_variant_ids. #25926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2015
Merged

Return an iterator from enum_variant_ids. #25926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions src/librustc/metadata/decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,28 @@ fn item_trait_ref<'tcx>(doc: rbml::Doc, tcx: &ty::ctxt<'tcx>, cdata: Cmd)
doc_trait_ref(tp, tcx, cdata)
}

fn enum_variant_ids(item: rbml::Doc, cdata: Cmd) -> Vec<ast::DefId> {
reader::tagged_docs(item, tag_items_data_item_variant)
.map(|p| translated_def_id(cdata, p))
.collect()
struct EnumVariantIds<'a> {
iter: reader::TaggedDocsIterator<'a>,
cdata: Cmd<'a>,
}

impl<'a> Iterator for EnumVariantIds<'a> {
type Item = ast::DefId;

fn next(&mut self) -> Option<ast::DefId> {
self.iter.next().map(|p| translated_def_id(self.cdata, p))
}

fn size_hint(&self) -> (usize, Option<usize>) {
self.iter.size_hint()
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to use a better size_hint? It's important since the iterator is collected when used.


fn enum_variant_ids<'a>(item: rbml::Doc<'a>, cdata: Cmd<'a>) -> EnumVariantIds<'a> {
EnumVariantIds {
iter: reader::tagged_docs(item, tag_items_data_item_variant),
cdata: cdata,
}
}

fn item_path(item_doc: rbml::Doc) -> Vec<ast_map::PathElem> {
Expand Down Expand Up @@ -719,11 +737,11 @@ pub fn get_enum_variant_defs(intr: &IdentInterner,
let data = cdata.data();
let items = reader::get_doc(rbml::Doc::new(data), tag_items);
let item = find_item(id, items);
enum_variant_ids(item, cdata).iter().map(|did| {
enum_variant_ids(item, cdata).map(|did| {
let item = find_item(did.node, items);
let name = item_name(intr, item);
let visibility = item_visibility(item);
match item_to_def_like(cdata, item, *did) {
match item_to_def_like(cdata, item, did) {
DlDef(def @ def::DefVariant(..)) => (def, name, visibility),
_ => unreachable!()
}
Expand All @@ -736,7 +754,7 @@ pub fn get_enum_variants<'tcx>(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::Nod
let items = reader::get_doc(rbml::Doc::new(data), tag_items);
let item = find_item(id, items);
let mut disr_val = 0;
enum_variant_ids(item, cdata).iter().map(|did| {
enum_variant_ids(item, cdata).map(|did| {
let item = find_item(did.node, items);
let ctor_ty = item_type(ast::DefId { krate: cdata.cnum, node: id},
item, tcx, cdata);
Expand Down Expand Up @@ -771,7 +789,7 @@ pub fn get_enum_variants<'tcx>(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::Nod
name: name,
// I'm not even sure if we encode visibility
// for variants -- TEST -- tjc
id: *did,
id: did,
disr_val: old_disr_val,
vis: ast::Inherited
})
Expand Down