bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #69636 - RalfJung:miri, r=nikomatsakis

Browse source 
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
commit 2b0cfa5b4c
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock
View file

@ -2137,6 +2137,7 @@ dependencies = [
"rustc-workspace-hack", "rustc-workspace-hack",
"rustc_version", "rustc_version",
"serde", "serde",
"serde_json",
"shell-escape", "shell-escape",
"vergen", "vergen",
] ]

2
src/bootstrap/test.rs
View file

@ -391,7 +391,7 @@ impl Step for Miri {
// Overwrite bootstrap's `rustc` wrapper overwriting our flags. // Overwrite bootstrap's `rustc` wrapper overwriting our flags.
cargo.env("RUSTC_DEBUG_ASSERTIONS", "true"); cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
// Let cargo-miri know where xargo ended up. // 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); let mut cargo = Command::from(cargo);
if !try_run(builder, &mut cargo) { if !try_run(builder, &mut cargo) {

2
src/tools/miri

@ -1 +1 @@
Subproject commit 3c444bf6a6cff3b9014005f21cc44995b34862ce Subproject commit 974c8be95ec17cd986251d7700cd432a39576939