bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

TyCtxt's map renamed to hir

Browse source
This commit is contained in:
Andrew Cann 2017-01-29 15:21:24 +08:00
parent dc336eecac
commit 1752af689f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bin/miri.rs
View file

@ -83,8 +83,8 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) {
fn visit_item(&mut self, i: &'hir hir::Item) { fn visit_item(&mut self, i: &'hir hir::Item) {
if let hir::Item_::ItemFn(_, _, _, _, _, body_id) = i.node { if let hir::Item_::ItemFn(_, _, _, _, _, body_id) = i.node {
if i.attrs.iter().any(|attr| attr.value.name == "test") { if i.attrs.iter().any(|attr| attr.value.name == "test") {
let did = self.1.map.body_owner_def_id(body_id); let did = self.1.hir.body_owner_def_id(body_id);
println!("running test: {}", self.1.map.def_path(did).to_string(self.1)); println!("running test: {}", self.1.hir.def_path(did).to_string(self.1));
miri::eval_main(self.1, did, self.0); miri::eval_main(self.1, did, self.0);
self.2.session.abort_if_errors(); self.2.session.abort_if_errors();
} }
@ -96,7 +96,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) {
state.hir_crate.unwrap().visit_all_item_likes(&mut Visitor(limits, tcx, state)); state.hir_crate.unwrap().visit_all_item_likes(&mut Visitor(limits, tcx, state));
} else { } else {
if let Some((entry_node_id, _)) = *state.session.entry_fn.borrow() { if let Some((entry_node_id, _)) = *state.session.entry_fn.borrow() {
let entry_def_id = tcx.map.local_def_id(entry_node_id); let entry_def_id = tcx.hir.local_def_id(entry_node_id);
miri::eval_main(tcx, entry_def_id, limits); miri::eval_main(tcx, entry_def_id, limits);
state.session.abort_if_errors(); state.session.abort_if_errors();

2
src/step.rs
View file

@ -225,7 +225,7 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'tcx> {
if let mir::Lvalue::Static(def_id) = *lvalue { if let mir::Lvalue::Static(def_id) = *lvalue {
let substs = self.ecx.tcx.intern_substs(&[]); let substs = self.ecx.tcx.intern_substs(&[]);
let span = self.span; let span = self.span;
if let Some(node_item) = self.ecx.tcx.map.get_if_local(def_id) { if let Some(node_item) = self.ecx.tcx.hir.get_if_local(def_id) {
if let hir::map::Node::NodeItem(&hir::Item { ref node, .. }) = node_item { if let hir::map::Node::NodeItem(&hir::Item { ref node, .. }) = node_item {
if let hir::ItemStatic(_, m, _) = *node { if let hir::ItemStatic(_, m, _) = *node {
self.global_item(def_id, substs, span, m == hir::MutImmutable); self.global_item(def_id, substs, span, m == hir::MutImmutable);