Use wax for globbing

.github/CODEOWNERS

@@ -35,7 +35,6 @@ pnpm-lock.yaml
 /crates
 
 # overrides for crates that are owned by turbo-oss
-/crates/globwalk @vercel/turbo-oss
 /crates/turborepo* @vercel/turbo-oss
 
 # overrides for crates that are owned by web-tooling

Cargo.toml

@@ -2,9 +2,6 @@
 resolver = "2"
 
 members = [
-  "crates/globwalk",
-  "crates/globwatch",
-  "crates/pidlock",
   "crates/node-file-trace",
   "crates/turbo-tasks*",
   "crates/turbopack*",

cli/internal/ffi/bindings.h

@@ -20,6 +20,8 @@ struct Buffer recursive_copy(struct Buffer buffer);
 
 struct Buffer verify_signature(struct Buffer buffer);
 
+struct Buffer glob(struct Buffer buffer);
+
 struct Buffer transitive_closure(struct Buffer buf);
 
 struct Buffer subgraph(struct Buffer buf);

crates/turborepo-ffi/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["staticlib"]
 
 [dependencies]
 directories = "4.0.1"
-globwalk = { version = "0.1.0", path = "../globwalk" }
+globwalk = { version = "0.1.0", path = "../turborepo-globwalk" }
 prost = "0.11.6"
 thiserror = { workspace = true }
 turbopath = { workspace = true }

crates/turborepo-ffi/src/lib.rs

@@ -6,7 +6,7 @@ mod lockfile;
 
 use std::{mem::ManuallyDrop, path::PathBuf};
 
-use globwalk::globwalk;
+use globwalk::{globwalk, WalkError};
 pub use lockfile::{patches, subgraph, transitive_closure};
 use turbopath::AbsoluteSystemPathBuf;
 
@@ -222,20 +222,39 @@ pub extern "C" fn glob(buffer: Buffer) -> Buffer {
         false => globwalk::WalkType::All,
     };
 
-    let response = globwalk(
+    let mut iter = match globwalk(
         &AbsoluteSystemPathBuf::new(req.base_path).expect("absolute"),
         &req.include_patterns,
         &req.exclude_patterns,
         walk_type,
-    )
-    .map(|res| res.map(|p| p.to_string_lossy().to_string()))
-    .collect();
+    ) {
+        Ok(iter) => iter,
+        Err(err) => {
+            let resp = proto::GlobResp {
+                response: Some(proto::glob_resp::Response::Error(err.to_string())),
+            };
+            return resp.into();
+        }
+    };
 
+    let paths = match iter.collect::<Result<Vec<_>, WalkError>>() {
+        Ok(paths) => paths,
+        Err(err) => {
+            let resp = proto::GlobResp {
+                response: Some(proto::glob_resp::Response::Error(err.to_string())),
+            };
+            return resp.into();
+        }
+    };
+    // TODO: is to_string_lossy the right thing to do here? We could error...
+    let files: Vec<_> = paths
+        .into_iter()
+        .map(|path| path.to_string_lossy().to_string())
+        .collect();
     proto::GlobResp {
-        response: Some(match response {
-            Ok(files) => proto::glob_resp::Response::Files(proto::GlobRespList { files }),
-            Err(e) => proto::glob_resp::Response::Error(e.to_string()),
-        }),
+        response: Some(proto::glob_resp::Response::Files(proto::GlobRespList {
+            files,
+        })),
     }
     .into()
 }