diff --git a/rust-version b/rust-version index 087b7c66427..69d072f1bfa 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2018-12-03 +nightly-2018-12-08 diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs index 6fa9b817ffe..92d4237146d 100644 --- a/src/bin/miri-rustc-tests.rs +++ b/src/bin/miri-rustc-tests.rs @@ -93,7 +93,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) { fn visit_item(&mut self, i: &'hir hir::Item) { if let hir::ItemKind::Fn(.., body_id) = i.node { if i.attrs.iter().any(|attr| attr.name() == "test") { - let did = self.0.hir.body_owner_def_id(body_id); + let did = self.0.hir().body_owner_def_id(body_id); println!("running test: {}", self.0.def_path_debug_str(did)); miri::eval_main(self.0, did, /*validate*/true); self.1.session.abort_if_errors(); @@ -105,7 +105,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) { } state.hir_crate.unwrap().visit_all_item_likes(&mut Visitor(tcx, state)); } else if let Some((entry_node_id, _, _)) = *state.session.entry_fn.borrow() { - let entry_def_id = tcx.hir.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, /*validate*/true); state.session.abort_if_errors(); diff --git a/src/bin/miri.rs b/src/bin/miri.rs index 1bbf3c8c4a4..e88c13305d1 100644 --- a/src/bin/miri.rs +++ b/src/bin/miri.rs @@ -128,7 +128,7 @@ fn after_analysis<'a, 'tcx>( attr.name() == "test" }) { - let did = self.tcx.hir.body_owner_def_id(body_id); + let did = self.tcx.hir().body_owner_def_id(body_id); println!( "running test: {}", self.tcx.def_path_debug_str(did), @@ -145,7 +145,7 @@ fn after_analysis<'a, 'tcx>( &mut Visitor { tcx, state, validate } ); } else if let Some((entry_node_id, _, _)) = *state.session.entry_fn.borrow() { - let entry_def_id = tcx.hir.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, validate); state.session.abort_if_errors();