ensure_version_or_cargo_install: don't hardcode path to cargo

Author: lolbinarycat

src/build_helper/src/util.rs

@@ -72,6 +72,7 @@ pub fn parse_gitmodules(target_dir: &Path) -> Vec<String> {
 /// otherwise install via cargo.
 pub fn ensure_version_or_cargo_install(
     build_dir: &Path,
+    cargo: &Path,
     pkg_name: &str,
     bin_name: &str,
     version: &str,
@@ -101,7 +102,7 @@ pub fn ensure_version_or_cargo_install(
     // use --force to ensure that if the required version is bumped, we update it.
     // use --target-dir to ensure we have a build cache so repeated invocations aren't slow.
     // modify PATH so that cargo doesn't print a warning telling the user to modify the path.
-    let cargo_exit_code = Command::new("cargo")
+    let cargo_exit_code = Command::new(cargo)
         .args(["install", "--locked", "--force", "--quiet"])
         .arg("--root")
         .arg(&tool_root_dir)

src/tools/tidy/src/extra_checks/mod.rs

@@ -53,6 +53,7 @@ pub fn check(
     librustdoc_path: &Path,
     tools_path: &Path,
     npm: &Path,
+    cargo: &Path,
     bless: bool,
     extra_checks: Option<&str>,
     pos_args: &[String],
@@ -65,6 +66,7 @@ pub fn check(
         librustdoc_path,
         tools_path,
         npm,
+        cargo,
         bless,
         extra_checks,
         pos_args,
@@ -80,6 +82,7 @@ fn check_impl(
     librustdoc_path: &Path,
     tools_path: &Path,
     npm: &Path,
+    cargo: &Path,
     bless: bool,
     extra_checks: Option<&str>,
     pos_args: &[String],
@@ -295,7 +298,7 @@ fn check_impl(
         } else {
             eprintln!("spellcheck files");
         }
-        spellcheck_runner(&outdir, &args)?;
+        spellcheck_runner(&outdir, &cargo, &args)?;
     }
 
     if js_lint || js_typecheck {
@@ -579,8 +582,8 @@ fn shellcheck_runner(args: &[&OsStr]) -> Result<(), Error> {
 }
 
 /// Check that spellchecker is installed then run it at the given path
-fn spellcheck_runner(outdir: &Path, args: &[&str]) -> Result<(), Error> {
-    let bin_path = ensure_version_or_cargo_install(outdir, "typos-cli", "typos", "1.34.0")?;
+fn spellcheck_runner(outdir: &Path, cargo: &Path, args: &[&str]) -> Result<(), Error> {
+    let bin_path = ensure_version_or_cargo_install(outdir, cargo, "typos-cli", "typos", "1.34.0")?;
 
     match Command::new(bin_path).args(args).status() {
         Ok(status) => {

src/tools/tidy/src/main.rs

@@ -184,6 +184,7 @@ fn main() {
             &librustdoc_path,
             &tools_path,
             &npm,
+            &cargo,
             bless,
             extra_checks,
             pos_args