Auto merge of rust-lang#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 rust-lang#69462
Dylan-DPC-zz · Mar 4, 2020 · 2b0cfa5 · 2b0cfa5
2 parents 7a3700c + faf3a5e
commit 2b0cfa5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -2137,6 +2137,7 @@ dependencies = [
  "rustc-workspace-hack",
  "rustc_version",
  "serde",
+ "serde_json",
  "shell-escape",
  "vergen",
 ]

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -391,7 +391,7 @@ impl Step for Miri {
             // Overwrite bootstrap's `rustc` wrapper overwriting our flags.
             cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
             // Let cargo-miri know where xargo ended up.
-            cargo.env("XARGO", builder.out.join("bin").join("xargo"));
+            cargo.env("XARGO_CHECK", builder.out.join("bin").join("xargo-check"));
 
             let mut cargo = Command::from(cargo);
             if !try_run(builder, &mut cargo) {

diff --git a/src/tools/miri b/src/tools/miri