Reimplement touch_all() to be xplat

Author: wesleywiser

Cargo.lock

@@ -30,6 +30,7 @@ jobserver = "0.1.21"
 crossbeam-utils = "0.7"
 snap = "1"
 filetime = "0.2.14"
+walkdir = "2"
 
 [target.'cfg(windows)'.dependencies]
 miow = "0.3"

collector/Cargo.toml

@@ -6,7 +6,7 @@ use collector::{command_output, robocopy};
 use database::{PatchName, QueryLabel};
 use futures::stream::FuturesUnordered;
 use futures::stream::StreamExt;
-use std::cmp;
+use std::{cmp, ffi::OsStr, path::Component};
 use std::collections::HashMap;
 use std::env;
 use std::fmt;
@@ -58,29 +58,48 @@ fn rename<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> anyhow::Result<()>
     Ok(())
 }
 
-fn touch(root: &Path, path: &Path) -> anyhow::Result<()> {
-    let joined = root.join(path);
+fn touch(path: &Path) -> anyhow::Result<()> {
+    log::info!("touching file {:?}", path);
 
-    log::info!("touching file {:?}", joined);
-
-    filetime::set_file_mtime(&joined, filetime::FileTime::now()).with_context(|| format!("touching file {:?}", joined))?;
+    filetime::set_file_mtime(path, filetime::FileTime::now()).with_context(|| format!("touching file {:?}", path))?;
 
     Ok(())
 }
 
 fn touch_all(path: &Path) -> anyhow::Result<()> {
-    let mut cmd = Command::new("bash");
-    // Don't touch files in `target/`, since they're likely generated by build scripts and might be from a dependency.
-    // Don't touch build scripts, which confuses the wrapped rustc.
-    cmd.current_dir(path)
-        .args(&["-c", "find . -path ./target -prune -false -o -name '*.rs' | grep -v '^./build.rs$' | xargs touch"]);
-    command_output(&mut cmd).with_context(|| format!("touching all .rs in {:?}", path))?;
-    // We also delete the cmake caches to avoid errors when moving directories around.
-    // This might be a bit slower but at least things build
-    let mut cmd = Command::new("bash");
-    cmd.current_dir(path)
-        .args(&["-c", "find . -name 'CMakeCache.txt' -delete"]);
-    command_output(&mut cmd).with_context(|| format!("deleting cmake caches in {:?}", path))?;
+    fn is_valid(path: &Path) -> bool {
+        let target_dir = Component::Normal(OsStr::new("target"));
+
+        // Don't touch files in `target/`, since they're likely generated by build scripts and might be from a dependency.
+        if path.components().any(|component| component == target_dir) {
+            return false;
+        }
+
+        if let Some(extn) = path.extension() {
+            if extn.to_str() == Some("rs") {
+                // Don't touch build scripts, which confuses the wrapped rustc.
+                return path.file_name() != Some(OsStr::new("build.rs"));
+            }
+        }
+
+        false
+    }
+
+    for entry in walkdir::WalkDir::new(path) {
+        let entry = entry?;
+        let path = entry.path();
+
+        // We also delete the cmake caches to avoid errors when moving directories around.
+        // This might be a bit slower but at least things build
+        if path.file_name() == Some(OsStr::new("CMakeCache.txt")) {
+            fs::remove_file(path).with_context(|| format!("deleting cmake caches in {:?}", path))?;
+        }
+
+        if is_valid(path) {
+            touch(path)?;
+        }
+    }
+
     Ok(())
 }
 
@@ -397,7 +416,7 @@ impl<'a> CargoProcess<'a> {
                 // in-tree (e.g., in the case of the servo crates there are a lot of
                 // other components).
                 if let Some(file) = &self.touch_file {
-                    touch(&self.cwd, Path::new(&file))?;
+                    touch(&self.cwd.join(Path::new(&file)))?;
                 } else {
                     touch_all(
                         &self.cwd.join(