Skip to content

Commit 0f6f857

Browse files
committed
---
yaml --- r: 110053 b: refs/heads/auto c: 0a0ab40 h: refs/heads/master i: 110051: 520264f v: v3
1 parent dd62d4d commit 0f6f857

File tree

2 files changed

+2
-40
lines changed

2 files changed

+2
-40
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 3f8d1588e8f571079293f27b3e89b9595feeeef6
16+
refs/heads/auto: 0a0ab4031c0c6b84adc6ad101277a65d1cd2e6df
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,6 @@ fn item_region_param_defs(item_doc: ebml::Doc, cdata: Cmd)
279279
Rc::new(v)
280280
}
281281

282-
fn item_ty_param_count(item: ebml::Doc) -> uint {
283-
let mut n = 0u;
284-
reader::tagged_docs(item, tag_items_data_item_ty_param_bounds,
285-
|_p| { n += 1u; true } );
286-
n
287-
}
288-
289282
fn enum_variant_ids(item: ebml::Doc, cdata: Cmd) -> Vec<ast::DefId> {
290283
let mut ids: Vec<ast::DefId> = Vec::new();
291284
let v = tag_items_data_item_variant;
@@ -420,10 +413,6 @@ pub fn get_type(cdata: Cmd, id: ast::NodeId, tcx: &ty::ctxt)
420413
}
421414
}
422415

423-
pub fn get_type_param_count(data: &[u8], id: ast::NodeId) -> uint {
424-
item_ty_param_count(lookup_item(id, data))
425-
}
426-
427416
pub fn get_impl_trait(cdata: Cmd,
428417
id: ast::NodeId,
429418
tcx: &ty::ctxt) -> Option<@ty::TraitRef>
@@ -449,20 +438,6 @@ pub fn get_impl_vtables(cdata: Cmd,
449438
}
450439

451440

452-
pub fn get_impl_method(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::NodeId,
453-
name: ast::Ident) -> Option<ast::DefId> {
454-
let items = reader::get_doc(reader::Doc(cdata.data()), tag_items);
455-
let mut found = None;
456-
reader::tagged_docs(find_item(id, items), tag_item_impl_method, |mid| {
457-
let m_did = reader::with_doc_data(mid, parse_def_id);
458-
if item_name(&*intr, find_item(m_did.node, items)) == name {
459-
found = Some(translate_def_id(cdata, m_did));
460-
}
461-
true
462-
});
463-
found
464-
}
465-
466441
pub fn get_symbol(data: &[u8], id: ast::NodeId) -> ~str {
467442
return item_symbol(lookup_item(id, data));
468443
}
@@ -475,14 +450,6 @@ pub enum DefLike {
475450
DlField
476451
}
477452

478-
pub fn def_like_to_def(def_like: DefLike) -> ast::Def {
479-
match def_like {
480-
DlDef(def) => return def,
481-
DlImpl(..) => fail!("found impl in def_like_to_def"),
482-
DlField => fail!("found field in def_like_to_def")
483-
}
484-
}
485-
486453
/// Iterates over the language items in the given crate.
487454
pub fn each_lang_item(cdata: Cmd, f: |ast::NodeId, uint| -> bool) -> bool {
488455
let root = reader::Doc(cdata.data());
@@ -1030,11 +997,6 @@ pub fn get_struct_fields(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::NodeId)
1030997
result
1031998
}
1032999

1033-
pub fn get_item_visibility(cdata: Cmd, id: ast::NodeId)
1034-
-> ast::Visibility {
1035-
item_visibility(lookup_item(id, cdata.data()))
1036-
}
1037-
10381000
fn get_meta_items(md: ebml::Doc) -> Vec<@ast::MetaItem> {
10391001
let mut items: Vec<@ast::MetaItem> = Vec::new();
10401002
reader::tagged_docs(md, tag_meta_item_word, |meta_item_doc| {
@@ -1103,7 +1065,7 @@ fn list_crate_attributes(md: ebml::Doc, hash: &Svh,
11031065
}
11041066

11051067
pub fn get_crate_attributes(data: &[u8]) -> Vec<ast::Attribute> {
1106-
return get_attributes(reader::Doc(data));
1068+
get_attributes(reader::Doc(data))
11071069
}
11081070

11091071
#[deriving(Clone)]

0 commit comments

Comments
 (0)