Auto merge of #922 - RalfJung:rustup, r=RalfJung

bump Rust and xargo
This commit is contained in:
bors 2019-08-26 18:13:47 +00:00
commit 601a3f1e22
2 changed files with 2 additions and 3 deletions

View File

@ -1 +1 @@
bea0372a1a7a31b81f28cc4d9a83a2dc9a79d008
521d78407471cb78e9bbf47160f6aa23047ac499

View File

@ -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()