Skip to content

Commit f06e25f

Browse files
committed
bump Rust version, fix build
1 parent 2286632 commit f06e25f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2018-12-03
1+
nightly-2018-12-08

src/bin/miri-rustc-tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) {
9393
fn visit_item(&mut self, i: &'hir hir::Item) {
9494
if let hir::ItemKind::Fn(.., body_id) = i.node {
9595
if i.attrs.iter().any(|attr| attr.name() == "test") {
96-
let did = self.0.hir.body_owner_def_id(body_id);
96+
let did = self.0.hir().body_owner_def_id(body_id);
9797
println!("running test: {}", self.0.def_path_debug_str(did));
9898
miri::eval_main(self.0, did, /*validate*/true);
9999
self.1.session.abort_if_errors();
@@ -105,7 +105,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) {
105105
}
106106
state.hir_crate.unwrap().visit_all_item_likes(&mut Visitor(tcx, state));
107107
} else if let Some((entry_node_id, _, _)) = *state.session.entry_fn.borrow() {
108-
let entry_def_id = tcx.hir.local_def_id(entry_node_id);
108+
let entry_def_id = tcx.hir().local_def_id(entry_node_id);
109109
miri::eval_main(tcx, entry_def_id, /*validate*/true);
110110

111111
state.session.abort_if_errors();

src/bin/miri.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn after_analysis<'a, 'tcx>(
128128
attr.name() == "test"
129129
})
130130
{
131-
let did = self.tcx.hir.body_owner_def_id(body_id);
131+
let did = self.tcx.hir().body_owner_def_id(body_id);
132132
println!(
133133
"running test: {}",
134134
self.tcx.def_path_debug_str(did),
@@ -145,7 +145,7 @@ fn after_analysis<'a, 'tcx>(
145145
&mut Visitor { tcx, state, validate }
146146
);
147147
} else if let Some((entry_node_id, _, _)) = *state.session.entry_fn.borrow() {
148-
let entry_def_id = tcx.hir.local_def_id(entry_node_id);
148+
let entry_def_id = tcx.hir().local_def_id(entry_node_id);
149149
miri::eval_main(tcx, entry_def_id, validate);
150150

151151
state.session.abort_if_errors();

0 commit comments

Comments
 (0)