diff options
| author | Andrew Gallant <jamslam@gmail.com> | 2023-01-05 08:51:08 -0500 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2023-01-05 08:51:08 -0500 |
| commit | e95254a86f484eec663be4714924d91d3cf39cb8 (patch) | |
| tree | 2858bec3b04f3bedbe0387ba2d4759b4ea5e43b1 | |
| parent | 2f484d8ce51618e7a8bdbca24190640d9aba1be3 (diff) | |
deps: remove ignore's dependency on crossbeam-utils
Scoped threads are now part of std.
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | crates/ignore/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/ignore/src/walk.rs | 7 |
3 files changed, 3 insertions, 6 deletions
@@ -251,7 +251,6 @@ name = "ignore" version = "0.4.18" dependencies = [ "crossbeam-channel", - "crossbeam-utils", "globset", "lazy_static", "log", diff --git a/crates/ignore/Cargo.toml b/crates/ignore/Cargo.toml index 97527ed4..e9ec0c3c 100644 --- a/crates/ignore/Cargo.toml +++ b/crates/ignore/Cargo.toml @@ -19,7 +19,6 @@ name = "ignore" bench = false [dependencies] -crossbeam-utils = "0.8.0" globset = { version = "0.4.10", path = "../globset" } lazy_static = "1.1" log = "0.4.5" diff --git a/crates/ignore/src/walk.rs b/crates/ignore/src/walk.rs index 8625b5f9..602faaec 100644 --- a/crates/ignore/src/walk.rs +++ b/crates/ignore/src/walk.rs @@ -1282,7 +1282,7 @@ impl WalkParallel { let quit_now = Arc::new(AtomicBool::new(false)); let num_pending = Arc::new(AtomicUsize::new(stack.lock().unwrap().len())); - crossbeam_utils::thread::scope(|s| { + std::thread::scope(|s| { let mut handles = vec![]; for _ in 0..threads { let worker = Worker { @@ -1296,13 +1296,12 @@ impl WalkParallel { skip: self.skip.clone(), filter: self.filter.clone(), }; - handles.push(s.spawn(|_| worker.run())); + handles.push(s.spawn(|| worker.run())); } for handle in handles { handle.join().unwrap(); } - }) - .unwrap(); // Pass along panics from threads + }); } fn threads(&self) -> usize { |