Merge pull request #2558 from mejrs/cargo

Call the right cargo binary
This commit is contained in:
David Hewitt 2022-08-25 18:25:02 +01:00 committed by GitHub
commit f927cdbba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ pub fn run(opts: DocOpts) -> anyhow::Result<()> {
std::env::set_var("RUSTDOCFLAGS", flags.join(" ")); std::env::set_var("RUSTDOCFLAGS", flags.join(" "));
cli::run( cli::run(
Command::new("cargo") Command::new(concat!(env!("CARGO_HOME"), "/bin/cargo"))
.args(if opts.stable { None } else { Some("+nightly") }) .args(if opts.stable { None } else { Some("+nightly") })
.arg("doc") .arg("doc")
.arg("--lib") .arg("--lib")

View File

@ -37,7 +37,7 @@ pub fn run() -> anyhow::Result<()> {
// Test MSRV // Test MSRV
cli::run( cli::run(
Command::new("cargo") Command::new(concat!(env!("CARGO_HOME"), "/bin/cargo"))
.arg(format!("+{}", MSRV)) .arg(format!("+{}", MSRV))
.arg("test") .arg("test")
.arg("--no-default-features") .arg("--no-default-features")
@ -54,7 +54,7 @@ pub fn run() -> anyhow::Result<()> {
)?; )?;
cli::run( cli::run(
Command::new("cargo") Command::new(concat!(env!("CARGO_HOME"), "/bin/cargo"))
.arg("+nightly") .arg("+nightly")
.arg("test") .arg("test")
.arg("--no-default-features") .arg("--no-default-features")