Skip to content

Commit 8f01343

Browse files
committed
rustc: Remove resolve_path
1 parent 75d3e3c commit 8f01343

File tree

2 files changed

+0
-56
lines changed

2 files changed

+0
-56
lines changed

src/rustc/metadata/csearch.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,6 @@ fn lookup_method_purity(cstore: cstore::cstore, did: ast::def_id)
5050
}
5151
}
5252

53-
/* Returns a vector of possible def IDs for a given path,
54-
in a given crate */
55-
fn resolve_path(cstore: cstore::cstore, cnum: ast::crate_num,
56-
path: ~[ast::ident]) ->
57-
~[(ast::crate_num, @~[u8], ast::def_id)] {
58-
let cm = cstore::get_crate_data(cstore, cnum);
59-
debug!{"resolve_path %s in crates[%d]:%s",
60-
ast_util::path_name_i(path), cnum, cm.name};
61-
let mut result = ~[];
62-
for decoder::resolve_path(path, cm.data).each |def| {
63-
if def.crate == ast::local_crate {
64-
vec::push(result, (cnum, cm.data, def));
65-
} else {
66-
if cm.cnum_map.contains_key(def.crate) {
67-
// This reexport is itself a reexport from another crate
68-
let next_cnum = cm.cnum_map.get(def.crate);
69-
let next_cm_data = cstore::get_crate_data(cstore, next_cnum);
70-
vec::push(result, (next_cnum, next_cm_data.data, def));
71-
}
72-
}
73-
}
74-
return result;
75-
}
76-
7753
/// Iterates over all the paths in the given crate.
7854
fn each_path(cstore: cstore::cstore, cnum: ast::crate_num,
7955
f: fn(decoder::path_entry) -> bool) {

src/rustc/metadata/decoder.rs

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -213,38 +213,6 @@ fn enum_variant_ids(item: ebml::doc, cdata: cmd) -> ~[ast::def_id] {
213213
return ids;
214214
}
215215

216-
// Given a path and serialized crate metadata, returns the IDs of the
217-
// definitions the path may refer to.
218-
fn resolve_path(path: ~[ast::ident], data: @~[u8]) -> ~[ast::def_id] {
219-
fn eq_item(data: &[u8], s: ~str) -> bool {
220-
// XXX: Use string equality.
221-
let data_len = data.len();
222-
let s_len = s.len();
223-
if data_len != s_len {
224-
return false;
225-
}
226-
let mut i = 0;
227-
while i < data_len {
228-
if data[i] != s[i] {
229-
return false;
230-
}
231-
i += 1;
232-
}
233-
return true;
234-
}
235-
let s = ast_util::path_name_i(path);
236-
let md = ebml::doc(data);
237-
let paths = ebml::get_doc(md, tag_paths);
238-
let eqer = |a| eq_item(a, s);
239-
let mut result: ~[ast::def_id] = ~[];
240-
debug!{"resolve_path: looking up %s", s};
241-
for lookup_hash(paths, eqer, hash_path(s)).each |doc| {
242-
let did_doc = ebml::get_doc(doc, tag_def_id);
243-
vec::push(result, ebml::with_doc_data(did_doc, |d| parse_def_id(d)));
244-
}
245-
return result;
246-
}
247-
248216
fn item_path(item_doc: ebml::doc) -> ast_map::path {
249217
let path_doc = ebml::get_doc(item_doc, tag_path);
250218

0 commit comments

Comments
 (0)