mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump Rust version, fix build

Browse Source
This commit is contained in:
Ralf Jung 2018-12-08 10:33:29 +01:00
parent 228663248c
commit f06e25f9b2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
nightly-2018-12-03
nightly-2018-12-08

4
src/bin/miri-rustc-tests.rs
View File

@ -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();

4
src/bin/miri.rs
View File

@ -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();