Skip to content

Commit 2b0cfa5

Browse files
committed
Auto merge of #69636 - RalfJung:miri, r=nikomatsakis
update miri Let's make that toolstate green again. :D This bumps serde in the lockfile, so r? @oli-obk Fixes #69462
2 parents 7a3700c + faf3a5e commit 2b0cfa5

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,7 @@ dependencies = [
21372137
"rustc-workspace-hack",
21382138
"rustc_version",
21392139
"serde",
2140+
"serde_json",
21402141
"shell-escape",
21412142
"vergen",
21422143
]

src/bootstrap/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl Step for Miri {
391391
// Overwrite bootstrap's `rustc` wrapper overwriting our flags.
392392
cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
393393
// Let cargo-miri know where xargo ended up.
394-
cargo.env("XARGO", builder.out.join("bin").join("xargo"));
394+
cargo.env("XARGO_CHECK", builder.out.join("bin").join("xargo-check"));
395395

396396
let mut cargo = Command::from(cargo);
397397
if !try_run(builder, &mut cargo) {

src/tools/miri

Submodule miri updated 47 files

0 commit comments

Comments
 (0)