OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename ast_map to hir_map

Browse Source
This commit is contained in:
Niko Matsakis 2015-09-11 11:29:17 -04:00
parent 34a25db45f
commit a6fee06741
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustc/metadata/decoder.rs
View File

@ -15,7 +15,7 @@
pub use self::DefLike::*;
use self::Family::*;
use front::map as ast_map;
use front::map as hir_map;
use rustc_front::hir;
use back::svh::Svh;
@ -241,15 +241,15 @@ fn item_trait_ref<'tcx>(doc: rbml::Doc, tcx: &ty::ctxt<'tcx>, cdata: Cmd)
doc_trait_ref(tp, tcx, cdata)
}
fn item_path(item_doc: rbml::Doc) -> Vec<ast_map::PathElem> {
fn item_path(item_doc: rbml::Doc) -> Vec<hir_map::PathElem> {
let path_doc = reader::get_doc(item_doc, tag_path);
reader::docs(path_doc).filter_map(|(tag, elt_doc)| {
if tag == tag_path_elem_mod {
let s = elt_doc.as_str_slice();
Some(ast_map::PathMod(token::intern(s)))
Some(hir_map::PathMod(token::intern(s)))
} else if tag == tag_path_elem_name {
let s = elt_doc.as_str_slice();
Some(ast_map::PathName(token::intern(s)))
Some(hir_map::PathName(token::intern(s)))
} else {
// ignore tag_path_len element
None
@ -745,7 +745,7 @@ pub fn each_top_level_item_of_crate<F, G>(intr: Rc<IdentInterner>,
callback)
}
pub fn get_item_path(cdata: Cmd, id: ast::NodeId) -> Vec<ast_map::PathElem> {
pub fn get_item_path(cdata: Cmd, id: ast::NodeId) -> Vec<hir_map::PathElem> {
item_path(cdata.lookup_item(id))
}
@ -756,9 +756,9 @@ pub fn get_item_name(intr: &IdentInterner, cdata: Cmd, id: ast::NodeId) -> ast::
pub type DecodeInlinedItem<'a> =
Box<for<'tcx> FnMut(Cmd,
&ty::ctxt<'tcx>,
Vec<ast_map::PathElem>,
Vec<hir_map::PathElem>,
rbml::Doc)
-> Result<&'tcx InlinedItem, Vec<ast_map::PathElem>> + 'a>;
-> Result<&'tcx InlinedItem, Vec<hir_map::PathElem>> + 'a>;
pub fn maybe_get_item_ast<'tcx>(cdata: Cmd, tcx: &ty::ctxt<'tcx>, id: ast::NodeId,
mut decode_inlined_item: DecodeInlinedItem)