user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustup for more LocalDefId changes

Browse source
This commit is contained in:
Ralf Jung 2020-04-28 10:30:21 +02:00
parent e06df3a881
commit a5445e0230
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
benches/helpers/miri_helper.rs
View file

@ -26,7 +26,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls<'_> {
self.bencher.iter(|| {
let config = miri::MiriConfig::default();
miri::eval_main(tcx, entry_def_id, config);
miri::eval_main(tcx, entry_def_id.to_def_id(), config);
});
});

2
rust-version
View file

@ -1 +1 @@
e83f7563495dbe2629b0cbc738afb0808c4482e1
fb5615a4771ea3d54256f969dc84d2dfd38d812c

2
src/bin/miri-rustc-tests.rs
View file

@ -54,7 +54,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
tcx.hir().krate().visit_all_item_likes(&mut Visitor(tcx));
} else if let Some((entry_def_id, _)) = tcx.entry_fn(LOCAL_CRATE) {
let config = miri::MiriConfig::default();
miri::eval_main(tcx, entry_def_id, config);
miri::eval_main(tcx, entry_def_id.to_def_id(), config);
compiler.session().abort_if_errors();
} else {

2
src/bin/miri.rs
View file

@ -39,7 +39,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
// Add filename to `miri` arguments.
config.args.insert(0, compiler.input().filestem().to_string());
if let Some(return_code) = miri::eval_main(tcx, entry_def_id, config) {
if let Some(return_code) = miri::eval_main(tcx, entry_def_id.to_def_id(), config) {
std::process::exit(
i32::try_from(return_code).expect("Return value was too large!"),
);