Auto merge of #2453 - RalfJung:rustup, r=RalfJung

rustup

Should work again, now that https://github.com/rust-lang/rust/pull/99984 landed.

cargo-miri/bin.rs

@@ -548,14 +548,14 @@ path = "lib.rs"
     // Manage the output the user sees.
     if only_setup {
         // We want to be explicit.
-        eprintln!("Preparing a sysroot for Miri...");
+        eprintln!("Preparing a sysroot for Miri (target: {target})...");
         if print_sysroot {
             // Be extra sure there is no noise on stdout.
             command.stdout(process::Stdio::null());
         }
     } else {
         // We want to be quiet, but still let the user know that something is happening.
-        eprint!("Preparing a sysroot for Miri... ");
+        eprint!("Preparing a sysroot for Miri (target: {target})... ");
         command.stdout(process::Stdio::null());
         command.stderr(process::Stdio::null());
     }

rust-version

@@ -1 +1 @@
-c11207ec89b856164bba03b8ecfe07b0b234ed21
+1f5d8d49eb6111931091f700d07518cd2b80bc18

src/eval.rs

@@ -312,6 +312,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
 /// Evaluates the entry function specified by `entry_id`.
 /// Returns `Some(return_code)` if program executed completed.
 /// Returns `None` if an evaluation error occurred.
+#[allow(clippy::needless_lifetimes)]
 pub fn eval_entry<'tcx>(
     tcx: TyCtxt<'tcx>,
     entry_id: DefId,

test-cargo-miri/run-test.py

@@ -29,7 +29,7 @@ def normalize_stdout(str):
     return str
 
 def normalize_stderr(str):
-    str = str.replace("Preparing a sysroot for Miri... done\n", "") # remove leading cargo-miri setup output
+    str = re.sub("Preparing a sysroot for Miri \(target: [a-z0-9_-]+\)\.\.\. done\n", "", str) # remove leading cargo-miri setup output
     return str
 
 def check_output(actual, path, name):