tidy: don't hardcode build/, use outdir

Author: lolbinarycat

src/tools/tidy/src/ext_tool_checks.rs

@@ -296,16 +296,16 @@ fn check_impl(
     }
 
     if js_lint || js_typecheck {
-        rustdoc_js::npm_install()?;
+        rustdoc_js::npm_install(outdir)?;
     }
 
     if js_lint {
-        rustdoc_js::lint(librustdoc_path, tools_path, src_path)?;
-        rustdoc_js::es_check(librustdoc_path)?;
+        rustdoc_js::lint(outdir, librustdoc_path, tools_path, src_path)?;
+        rustdoc_js::es_check(outdir, librustdoc_path)?;
     }
 
     if js_typecheck {
-        rustdoc_js::typecheck(librustdoc_path)?;
+        rustdoc_js::typecheck(outdir, librustdoc_path)?;
     }
 
     Ok(())

src/tools/tidy/src/ext_tool_checks/rustdoc_js.rs

@@ -11,19 +11,16 @@ use ignore::DirEntry;
 
 use crate::walk::walk_no_read;
 
-fn node_module_bin(name: &str) -> String {
-    format!("build/node_modules/.bin/{name}")
+fn node_module_bin(outdir: &Path, name: &str) -> PathBuf {
+    outdir.join(name)
 }
 
 /// install all js dependencies from package.json.
-pub(super) fn npm_install() -> Result<(), super::Error> {
-    // will error if already exists, so ignore the error.
-    // if there is a filesystem permission issue,
-    // later commands will error.
-    let _ = fs::create_dir("build");
-    // copy stuff to build/ to make node_modules get put there.
-    fs::copy("package.json", "build/package.json")?;
-    fs::copy("package-lock.json", "build/package-lock.json")?;
+pub(super) fn npm_install(outdir: &Path) -> Result<(), super::Error> {
+    let copy_to_build = |p| fs::copy(p, outdir.join(p));
+    // copy stuff to the output directory to make node_modules get put there.
+    copy_to_build("package.json")?;
+    copy_to_build("package-lock.json")?;
 
     let mut cmd = Command::new("npm");
     if CiEnv::is_ci() {
@@ -36,7 +33,7 @@ pub(super) fn npm_install() -> Result<(), super::Error> {
     // this makes tidy output less noisy, and also significantly improves runtime
     // of repeated tidy invokations.
     cmd.args(&["--audit=false", "--save=false", "--fund=false"]);
-    cmd.current_dir("build");
+    cmd.current_dir(outdir);
     let mut child = cmd.spawn()?;
     match child.wait() {
         Ok(exit_status) => {
@@ -61,8 +58,8 @@ fn rustdoc_js_files(librustdoc_path: &Path) -> Vec<PathBuf> {
     return files;
 }
 
-fn run_eslint(args: &[PathBuf], config_folder: PathBuf) -> Result<(), super::Error> {
-    let mut child = Command::new(node_module_bin("eslint"))
+fn run_eslint(outdir: &Path, args: &[PathBuf], config_folder: PathBuf) -> Result<(), super::Error> {
+    let mut child = Command::new(node_module_bin(outdir, "eslint"))
         .arg("-c")
         .arg(config_folder.join(".eslintrc.js"))
         .args(args)
@@ -94,6 +91,7 @@ fn get_eslint_version() -> Option<String> {
 }
 
 pub(super) fn lint(
+    outdir: &Path,
     librustdoc_path: &Path,
     tools_path: &Path,
     src_path: &Path,
@@ -135,16 +133,20 @@ pub(super) fn lint(
     }
     let files_to_check = rustdoc_js_files(librustdoc_path);
     println!("Running eslint on rustdoc JS files");
-    run_eslint(&files_to_check, librustdoc_path.join("html/static"))?;
+    run_eslint(outdir, &files_to_check, librustdoc_path.join("html/static"))?;
 
-    run_eslint(&[tools_path.join("rustdoc-js/tester.js")], tools_path.join("rustdoc-js"))?;
-    run_eslint(&[tools_path.join("rustdoc-gui/tester.js")], tools_path.join("rustdoc-gui"))?;
+    run_eslint(outdir, &[tools_path.join("rustdoc-js/tester.js")], tools_path.join("rustdoc-js"))?;
+    run_eslint(
+        outdir,
+        &[tools_path.join("rustdoc-gui/tester.js")],
+        tools_path.join("rustdoc-gui"),
+    )?;
     Ok(())
 }
 
-pub(super) fn typecheck(librustdoc_path: &Path) -> Result<(), super::Error> {
+pub(super) fn typecheck(outdir: &Path, librustdoc_path: &Path) -> Result<(), super::Error> {
     // use npx to ensure correct version
-    let mut child = Command::new(node_module_bin("tsc"))
+    let mut child = Command::new(node_module_bin(outdir, "tsc"))
         .arg("-p")
         .arg(librustdoc_path.join("html/static/js/tsconfig.json"))
         .spawn()?;
@@ -159,9 +161,9 @@ pub(super) fn typecheck(librustdoc_path: &Path) -> Result<(), super::Error> {
     }
 }
 
-pub(super) fn es_check(librustdoc_path: &Path) -> Result<(), super::Error> {
+pub(super) fn es_check(outdir: &Path, librustdoc_path: &Path) -> Result<(), super::Error> {
     let files_to_check = rustdoc_js_files(librustdoc_path);
-    let mut cmd = Command::new(node_module_bin("es-check"));
+    let mut cmd = Command::new(node_module_bin(outdir, "es-check"));
     cmd.arg("es2019");
     for f in files_to_check {
         cmd.arg(f);