From c6c9276d6122e4302ee42389eaf29e51ef795a57 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 26 Aug 2019 19:44:27 +0200 Subject: [PATCH] bump Rust and xargo --- rust-version | 2 +- src/bin/cargo-miri.rs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rust-version b/rust-version index 012763c0002..70f10366b99 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -bea0372a1a7a31b81f28cc4d9a83a2dc9a79d008 +521d78407471cb78e9bbf47160f6aa23047ac499 diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs index b1dc306bcb1..8749e5b7eed 100644 --- a/src/bin/cargo-miri.rs +++ b/src/bin/cargo-miri.rs @@ -243,7 +243,7 @@ fn setup(ask_user: bool) { } // First, we need xargo. - if xargo_version().map_or(true, |v| v < (0, 3, 15)) { + if xargo_version().map_or(true, |v| v < (0, 3, 16)) { if ask_user { ask("It seems you do not have a recent enough xargo installed. I will run `cargo install xargo -f`. Proceed?"); } else { @@ -297,7 +297,6 @@ default_features = false features = ["panic_unwind"] [dependencies.test] -stage = 1 "#).unwrap(); // The boring bits: a dummy project for xargo. File::create(dir.join("Cargo.toml")).unwrap()