Skip to content

Commit 29e5aa0

Browse files
committed
Remove some unnecessary closures
1 parent b65dc42 commit 29e5aa0

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/librustc/metadata/decoder.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ fn item_symbol(item: ebml::Doc) -> ~str {
174174

175175
fn item_parent_item(d: ebml::Doc) -> Option<ast::def_id> {
176176
for reader::tagged_docs(d, tag_items_data_parent_item) |did| {
177-
return Some(reader::with_doc_data(did, |d| parse_def_id(d)));
177+
return Some(reader::with_doc_data(did, parse_def_id));
178178
}
179179
None
180180
}
@@ -195,8 +195,7 @@ fn item_reqd_and_translated_parent_item(cnum: ast::crate_num,
195195

196196
fn item_def_id(d: ebml::Doc, cdata: cmd) -> ast::def_id {
197197
let tagdoc = reader::get_doc(d, tag_def_id);
198-
return translate_def_id(cdata, reader::with_doc_data(tagdoc,
199-
|d| parse_def_id(d)));
198+
return translate_def_id(cdata, reader::with_doc_data(tagdoc, parse_def_id));
200199
}
201200

202201
fn each_reexport(d: ebml::Doc, f: &fn(ebml::Doc) -> bool) -> bool {
@@ -282,7 +281,7 @@ fn enum_variant_ids(item: ebml::Doc, cdata: cmd) -> ~[ast::def_id] {
282281
let mut ids: ~[ast::def_id] = ~[];
283282
let v = tag_items_data_item_variant;
284283
for reader::tagged_docs(item, v) |p| {
285-
let ext = reader::with_doc_data(p, |d| parse_def_id(d));
284+
let ext = reader::with_doc_data(p, parse_def_id);
286285
ids.push(ast::def_id { crate: cdata.cnum, node: ext.node });
287286
};
288287
return ids;
@@ -424,7 +423,7 @@ pub fn get_impl_method(intr: @ident_interner, cdata: cmd, id: ast::node_id,
424423
let mut found = None;
425424
for reader::tagged_docs(find_item(id, items), tag_item_impl_method)
426425
|mid| {
427-
let m_did = reader::with_doc_data(mid, |d| parse_def_id(d));
426+
let m_did = reader::with_doc_data(mid, parse_def_id);
428427
if item_name(intr, find_item(m_did.node, items)) == name {
429428
found = Some(translate_def_id(cdata, m_did));
430429
}
@@ -662,7 +661,7 @@ fn item_impl_methods(intr: @ident_interner, cdata: cmd, item: ebml::Doc,
662661
base_tps: uint) -> ~[@resolve::MethodInfo] {
663662
let mut rslt = ~[];
664663
for reader::tagged_docs(item, tag_item_impl_method) |doc| {
665-
let m_did = reader::with_doc_data(doc, |d| parse_def_id(d));
664+
let m_did = reader::with_doc_data(doc, parse_def_id);
666665
let mth_item = lookup_item(m_did.node, cdata.data);
667666
let explicit_self = get_explicit_self(mth_item);
668667
rslt.push(@resolve::MethodInfo {
@@ -684,7 +683,7 @@ pub fn get_impls_for_mod(intr: @ident_interner,
684683
let mod_item = lookup_item(m_id, data);
685684
let mut result = ~[];
686685
for reader::tagged_docs(mod_item, tag_mod_impl) |doc| {
687-
let did = reader::with_doc_data(doc, |d| parse_def_id(d));
686+
let did = reader::with_doc_data(doc, parse_def_id);
688687
let local_did = translate_def_id(cdata, did);
689688
debug!("(get impls for mod) getting did %? for '%?'",
690689
local_did, name);

0 commit comments

Comments
 (0)