diff options
| author | bors <bors@rust-lang.org> | 2020-03-04 10:44:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-04 10:44:55 +0000 |
| commit | 2b0cfa5b4c5099f45ca540ee1c7d8c1ecd5267d2 (patch) | |
| tree | b946585a47229f8860785fda55589bfe05639020 | |
| parent | 7a3700c37132385e8e965c18e73d0a09f9146335 (diff) | |
| parent | faf3a5ea72eab113232b79d4ad4bab6a11513780 (diff) | |
| download | rust-2b0cfa5b4c5099f45ca540ee1c7d8c1ecd5267d2.tar.gz rust-2b0cfa5b4c5099f45ca540ee1c7d8c1ecd5267d2.zip | |
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
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 2 | ||||
| m--------- | src/tools/miri | 16 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 45ad7fee9f9..8505470a663 100644 --- 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 index 4cfda606c4b..1b9e9a88948 100644 --- 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 -Subproject 3c444bf6a6cff3b9014005f21cc44995b34862c +Subproject 974c8be95ec17cd986251d7700cd432a3957693 |