bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #4624 - sinkuu:workaround_cargo, r=llogiq

Browse source 
Workaround cargo issue on appveyor

Use absolute paths for `cargo` and `rustfmt` to workaround https://github.com/rust-lang/cargo/issues/7475.

Appveyor passed on my fork: https://ci.appveyor.com/project/sinkuu/rust-clippy/builds/27870367

changelog: none
This commit is contained in:
bors 2019-10-04 05:42:25 +00:00
commit b824f021d6
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
clippy_dev/Cargo.toml
View file

@ -11,3 +11,5 @@ regex = "1"
lazy_static = "1.0" lazy_static = "1.0"
shell-escape = "0.1" shell-escape = "0.1"
walkdir = "2" walkdir = "2"
# FIXME: remove this once cargo issue #7475 is fixed
home = "0.5"

15
clippy_dev/src/fmt.rs
View file

@ -140,13 +140,13 @@ fn cargo_fmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> {
args.push("--"); args.push("--");
args.push("--check"); args.push("--check");
} }
let success = exec(context, "cargo", path, &args)?; let success = exec(context, &bin_path("cargo"), path, &args)?;
Ok(success) Ok(success)
} }
fn rustfmt_test(context: &FmtContext) -> Result<(), CliError> { fn rustfmt_test(context: &FmtContext) -> Result<(), CliError> {
let program = "rustfmt"; let program = bin_path("rustfmt");
let dir = std::env::current_dir()?; let dir = std::env::current_dir()?;
let args = &["+nightly", "--version"]; let args = &["+nightly", "--version"];
@ -173,7 +173,7 @@ fn rustfmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> {
if context.check { if context.check {
args.push("--check".as_ref()); args.push("--check".as_ref());
} }
let success = exec(context, "rustfmt", std::env::current_dir()?, &args)?; let success = exec(context, &bin_path("rustfmt"), std::env::current_dir()?, &args)?;
if !success { if !success {
eprintln!("rustfmt failed on {}", path.display()); eprintln!("rustfmt failed on {}", path.display());
} }
@ -198,3 +198,12 @@ fn project_root() -> Result<PathBuf, CliError> {
Err(CliError::ProjectRootNotFound) Err(CliError::ProjectRootNotFound)
} }
// Workaround for https://github.com/rust-lang/cargo/issues/7475.
// FIXME: replace `&bin_path("command")` with `"command"` once the issue is fixed
fn bin_path(bin: &str) -> String {
let mut p = home::cargo_home().unwrap();
p.push("bin");
p.push(bin);
p.display().to_string()
}