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 https://github.com/rust-lang/rust/issues/69462
This commit is contained in:
bors
2020-03-04 10:44:55 +00:00
3 changed files with 3 additions and 2 deletions
+1
View File
@@ -2137,6 +2137,7 @@ dependencies = [
"rustc-workspace-hack",
"rustc_version",
"serde",
"serde_json",
"shell-escape",
"vergen",
]
+1 -1
View File
@@ -391,7 +391,7 @@ fn run(self, builder: &Builder<'_>) {
// 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) {