rustup for more LocalDefId changes

diff --git a/benches/helpers/miri_helper.rs b/benches/helpers/miri_helper.rs
index 589a95b668f37289c30bd4f4f8eb66ebe71de672..2e71c7eb8b1d5d1d9713982fa373b0354afe2cf8 100644 (file)
--- a/benches/helpers/miri_helper.rs
+++ b/benches/helpers/miri_helper.rs
@@ -26,7 +26,7 @@ fn after_analysis<'tcx>(
 
             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);
             });
         });
 

diff --git a/rust-version b/rust-version
index 53979b82cf83432190aef0411e9e6b6c74dcf257..173566bdf616a92f2a2a61201a34a38b0827b2c6 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-e83f7563495dbe2629b0cbc738afb0808c4482e1
+fb5615a4771ea3d54256f969dc84d2dfd38d812c

diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs
index bae7356eb72c865d1ab3a47f31a3e112026e1a11..add9cfe897fb152eec92121d52926e643567c7ed 100644 (file)
--- a/src/bin/miri-rustc-tests.rs
+++ b/src/bin/miri-rustc-tests.rs
@@ -54,7 +54,7 @@ fn visit_impl_item(&mut self, _impl_item: &'hir hir::ImplItem) {}
                 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 {

diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index 4e20e3a12da7e000e0d5940f14f04d422357516b..06101fe24e2d8256d541790b71599ab1c2542099 100644 (file)
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -39,7 +39,7 @@ fn after_analysis<'tcx>(
             // 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!"),
                 );