diff --git a/Cargo.lock b/Cargo.lock index 742451cac..1b7828a06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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 97527ed44..e9ec0c3c6 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 8625b5f9b..602faaec3 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 {