diff options
Diffstat (limited to 'src/libsyntax/ast_map.rs')
| -rw-r--r-- | src/libsyntax/ast_map.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs index a7d5c0ce75f..5266d1b049a 100644 --- a/src/libsyntax/ast_map.rs +++ b/src/libsyntax/ast_map.rs @@ -110,7 +110,7 @@ pub struct Ctx { map: @map, path: path, local_id: uint, - diag: span_handler, + diag: @span_handler, } pub type vt = visit::vt<@mut Ctx>; @@ -132,7 +132,7 @@ pub fn mk_ast_map_visitor() -> vt { }); } -pub fn map_crate(diag: span_handler, c: crate) -> map { +pub fn map_crate(diag: @span_handler, c: crate) -> map { let cx = @mut Ctx { map: @std::oldmap::HashMap(), path: ~[], @@ -146,9 +146,9 @@ pub fn map_crate(diag: span_handler, c: crate) -> map { // Used for items loaded from external crate that are being inlined into this // crate. The `path` should be the path to the item but should not include // the item itself. -pub fn map_decoded_item(diag: span_handler, +pub fn map_decoded_item(diag: @span_handler, map: map, - path: path, + +path: path, ii: inlined_item) { // I believe it is ok for the local IDs of inlined items from other crates // to overlap with the local ids from this crate, so just generate the ids @@ -171,10 +171,10 @@ pub fn map_decoded_item(diag: span_handler, ii_item(*) | ii_dtor(*) => { /* fallthrough */ } ii_foreign(i) => { cx.map.insert(i.id, node_foreign_item(i, foreign_abi_rust_intrinsic, - @/*bad*/ copy path)); + @path)); } ii_method(impl_did, m) => { - map_method(impl_did, @/*bad*/ copy path, m, cx); + map_method(impl_did, @path, m, cx); } } |