Auto merge of #1783 - hyd-dev:rustup, r=RalfJung

Rustup for rust-lang/rust#84401

cc rust-lang/rust#84741

benches/helpers/miri_helper.rs

@@ -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.to_def_id(), config);
+                miri::eval_main(tcx, entry_def_id, config);
             });
         });
 

rust-version

@@ -1 +1 @@
-06f0adb34570ba83fee391abeb0bec0eec28a234
+bcd696d722c04a0f8c34d884aa4ed2322f55cdd8

src/bin/miri.rs

@@ -50,7 +50,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                 env::set_current_dir(cwd).unwrap();
             }
 
-            if let Some(return_code) = miri::eval_main(tcx, entry_def_id.to_def_id(), config) {
+            if let Some(return_code) = miri::eval_main(tcx, entry_def_id, config) {
                 std::process::exit(
                     i32::try_from(return_code).expect("Return value was too large!"),
                 );

test-cargo-miri/Cargo.toml

@@ -23,3 +23,7 @@ serde_derive = "1.0" # not actually used, but exercises some unique code path (`
 
 [lib]
 test = false # test that this is respected (will show in the output)
+
+[[test]]
+name = "main"
+harness = false

test-cargo-miri/src/lib.rs

@@ -14,3 +14,7 @@ pub fn make_true() -> bool {
     issue_1760::use_the_dependency!();
     issue_1691::use_me()
 }
+
+pub fn main() {
+    println!("imported main");
+}

test-cargo-miri/test.cross-target.stdout.ref

@@ -3,6 +3,7 @@ running 1 test
 .
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 
+imported main
 
 running 7 tests
 ..i....

test-cargo-miri/test.default.stdout.ref

@@ -3,6 +3,7 @@ running 1 test
 .
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 
+imported main
 
 running 7 tests
 ..i....

test-cargo-miri/test.filter.cross-target.stdout.ref

@@ -3,6 +3,7 @@ running 0 tests
 
 test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out
 
+imported main
 
 running 1 test
 test simple1 ... ok

test-cargo-miri/test.filter.stdout.ref

@@ -3,6 +3,7 @@ running 0 tests
 
 test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out
 
+imported main
 
 running 1 test
 test simple1 ... ok

test-cargo-miri/tests/main.rs

@@ -0,0 +1,3 @@
+#![feature(imported_main)]
+
+use cargo_miri_test::main;

tests/run-pass/main_fn.rs

@@ -0,0 +1,7 @@
+#![feature(imported_main)]
+
+mod foo {
+    pub(crate) fn bar() {}
+}
+
+use foo::bar as main;