Skip to content

Commit 843691d

Browse files
committed
Auto merge of #882 - RalfJung:miri-rustc, r=RalfJung
install xargo from git temporarily This is so that once japaric/xargo#246 landed, we can see if that helps with rust-lang/rust#63162.
2 parents d9d6df9 + 162c0ff commit 843691d

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/bin/cargo-miri.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::fs::{self, File};
44
use std::io::{self, Write, BufRead};
55
use std::path::{PathBuf, Path};
66
use std::process::Command;
7+
use std::ops::Not;
78

89
const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri
910
@@ -249,9 +250,10 @@ fn setup(ask_user: bool) {
249250
println!("Installing xargo: `cargo install xargo -f`");
250251
}
251252

252-
if !cargo().args(&["install", "xargo", "-f"]).status()
253+
// FIXME: Install from crates.io again once a new xargo got released.
254+
if cargo().args(&["install", "xargo", "-f", "--git", "https://github.com/japaric/xargo"]).status()
253255
.expect("failed to install xargo")
254-
.success()
256+
.success().not()
255257
{
256258
show_error(format!("Failed to install xargo"));
257259
}
@@ -325,9 +327,9 @@ path = "lib.rs"
325327
command.arg("--target").arg(&target);
326328
}
327329
// Finally run it!
328-
if !command.status()
330+
if command.status()
329331
.expect("failed to run xargo")
330-
.success()
332+
.success().not()
331333
{
332334
show_error(format!("Failed to run xargo"));
333335
}

0 commit comments

Comments
 (0)