diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-02-11 09:49:02 -0800 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-02-11 09:49:02 -0800 |
| commit | fc023d91c77f468211ba9f7681b4d2a6469aac74 (patch) | |
| tree | e2906dead47dd5abc1ea05e905e92931985951c1 /src/comp | |
| parent | 2ec3a0b60833736a3c0d805768885b4392c36100 (diff) | |
Revert prior commit until I have time to track down the valgrind error
This reverts commit 2ec3a0b60833736a3c0d805768885b4392c36100.
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/metadata/csearch.rs | 3 | ||||
| -rw-r--r-- | src/comp/middle/ast_map.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/comp/metadata/csearch.rs b/src/comp/metadata/csearch.rs index 6cd78d0b5c4..1ac86faed0d 100644 --- a/src/comp/metadata/csearch.rs +++ b/src/comp/metadata/csearch.rs @@ -60,8 +60,7 @@ fn resolve_path(cstore: cstore::cstore, cnum: ast::crate_num, fn get_item_path(tcx: ty::ctxt, def: ast::def_id) -> ast_map::path { let cstore = tcx.sess.cstore; let cdata = cstore::get_crate_data(cstore, def.crate); - let path = decoder::get_item_path(cdata, def.node); - [ast_map::path_mod(cdata.name)] + path + ret decoder::get_item_path(cdata, def.node); } fn get_enum_variants(tcx: ty::ctxt, def: ast::def_id) -> [ty::variant_info] { diff --git a/src/comp/middle/ast_map.rs b/src/comp/middle/ast_map.rs index 01ad8a3df67..1504f5f738e 100644 --- a/src/comp/middle/ast_map.rs +++ b/src/comp/middle/ast_map.rs @@ -17,7 +17,7 @@ fn path_to_str_with_sep(p: path, sep: str) -> str { } fn path_to_str(p: path) -> str { - "::" + path_to_str_with_sep(p, "::") + path_to_str_with_sep(p, "::") } enum ast_node { |