From 0a6f45e2e5057fa47c4687edb493e9ce02a5db9a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 2 Mar 2020 22:43:31 +0100 Subject: [PATCH 1/2] point cargo-miri to the right xargo binary --- src/bootstrap/test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From faf3a5ea72eab113232b79d4ad4bab6a11513780 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 4 Mar 2020 11:03:08 +0100 Subject: [PATCH 2/2] update miri --- Cargo.lock | 1 + src/tools/miri | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index f639095fae7..5fe55d82767 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2156,6 +2156,7 @@ dependencies = [ "rustc-workspace-hack", "rustc_version", "serde", + "serde_json", "shell-escape", "vergen", ] diff --git a/src/tools/miri b/src/tools/miri index 3c444bf6a6c..974c8be95ec 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit 3c444bf6a6cff3b9014005f21cc44995b34862ce +Subproject commit 974c8be95ec17cd986251d7700cd432a39576939