From cf3376e541bea322370a9b0c521d292551a00642 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 17 May 2021 09:34:39 +0200
Subject: [PATCH] rustup

---
 benches/helpers/miri_helper.rs | 3 +--
 rust-version                   | 2 +-
 src/bin/miri.rs                | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/benches/helpers/miri_helper.rs b/benches/helpers/miri_helper.rs
index 7642018c08cb..144ddc11968c 100644
--- a/benches/helpers/miri_helper.rs
+++ b/benches/helpers/miri_helper.rs
@@ -3,7 +3,6 @@ extern crate rustc_hir;
 extern crate rustc_interface;
 
 use rustc_driver::Compilation;
-use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_interface::{interface, Queries};
 
 use crate::test::Bencher;
@@ -22,7 +21,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls<'_> {
 
         queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
             let (entry_def_id, _) =
-                tcx.entry_fn(LOCAL_CRATE).expect("no main or start function found");
+                tcx.entry_fn(()).expect("no main or start function found");
 
             self.bencher.iter(|| {
                 let config = miri::MiriConfig::default();
diff --git a/rust-version b/rust-version
index 0495fc97f7f7..600ef9d5a6e3 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-c6dd87a6b4a62cf5d2cb6207b1dcea652ea1aa60
+3396a383bb1d1fdad8ceeb74f16cf08e0bd62a1b
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index 0e9a6ffe8050..4a1ea3a54286 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -16,7 +16,6 @@ use log::debug;
 
 use rustc_driver::Compilation;
 use rustc_errors::emitter::{ColorConfig, HumanReadableErrorType};
-use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::{config::ErrorOutputType, CtfeBacktrace};
 
@@ -34,7 +33,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
 
         queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
             init_late_loggers(tcx);
-            let (entry_def_id, _) = if let Some((entry_def, x)) = tcx.entry_fn(LOCAL_CRATE) {
+            let (entry_def_id, _) = if let Some((entry_def, x)) = tcx.entry_fn(()) {
                 (entry_def, x)
             } else {
                 let output_ty = ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(