diff --git a/cargo-miri/bin.rs b/cargo-miri/bin.rs index 9c98542be8..4ddf229536 100644 --- a/cargo-miri/bin.rs +++ b/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()); } diff --git a/rust-version b/rust-version index 5f09f4f35b..22daf00bd0 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c11207ec89b856164bba03b8ecfe07b0b234ed21 +1f5d8d49eb6111931091f700d07518cd2b80bc18 diff --git a/src/eval.rs b/src/eval.rs index c6fde1e683..cb24dea3a8 100644 --- a/src/eval.rs +++ b/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, diff --git a/test-cargo-miri/run-test.py b/test-cargo-miri/run-test.py index 3805bd1977..4485d3252c 100755 --- a/test-cargo-miri/run-test.py +++ b/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):