mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #725 from RalfJung/xargo

Browse Source 
switch back to upstream xargo
This commit is contained in:
Oliver Scherer 2019-05-10 11:40:23 +02:00 committed by GitHub
commit 72698b1b30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/cargo-miri.rs
View File

@ -133,13 +133,10 @@ fn xargo_version() -> Option<(u32, u32, u32)> {
(split.next().expect("malformed `xargo --version` output: empty"),
split.next().expect("malformed `xargo --version` output: not at least two words"))
};
if name == "xargo" {
// This is the upstream version which is currently broken, we need our fork.
if name != "xargo" {
// This is some fork of xargo
return None;
}
if name != "xargo-rj" {
panic!("malformed `xargo --version` output: application name is not `xargo`");
}
let mut version_pieces = version.split('.');
let major = version_pieces.next()
.expect("malformed `xargo --version` output: not a major version piece")
@ -185,13 +182,13 @@ fn setup(ask_user: bool) {
// First, we need xargo.
let xargo = xargo_version();
if xargo.map_or(true, |v| v < (0, 3, 13)) {
if xargo.map_or(true, |v| v < (0, 3, 14)) {
if ask_user {
ask("It seems you do not have a recent enough xargo installed. I will run `cargo install --git https://github.com/RalfJung/xargo -f`. Proceed?");
ask("It seems you do not have a recent enough xargo installed. I will run `cargo install xargo -f`. Proceed?");
} else {
println!("Installing xargo: `cargo install --git https://github.com/RalfJung/xargo -f`");
println!("Installing xargo: `cargo install xargo -f`");
}
if !Command::new("cargo").args(&["install", "--git", "https://github.com/RalfJung/xargo", "-f"]).status().unwrap().success() {
if !Command::new("cargo").args(&["install", "xargo", "-f"]).status().unwrap().success() {
show_error(format!("Failed to install xargo"));
}
}