Skip to content

Commit e95254a

Browse files
committed
deps: remove ignore's dependency on crossbeam-utils
Scoped threads are now part of std.
1 parent 2f484d8 commit e95254a

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/ignore/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ name = "ignore"
1919
bench = false
2020

2121
[dependencies]
22-
crossbeam-utils = "0.8.0"
2322
globset = { version = "0.4.10", path = "../globset" }
2423
lazy_static = "1.1"
2524
log = "0.4.5"

crates/ignore/src/walk.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ impl WalkParallel {
12821282
let quit_now = Arc::new(AtomicBool::new(false));
12831283
let num_pending =
12841284
Arc::new(AtomicUsize::new(stack.lock().unwrap().len()));
1285-
crossbeam_utils::thread::scope(|s| {
1285+
std::thread::scope(|s| {
12861286
let mut handles = vec![];
12871287
for _ in 0..threads {
12881288
let worker = Worker {
@@ -1296,13 +1296,12 @@ impl WalkParallel {
12961296
skip: self.skip.clone(),
12971297
filter: self.filter.clone(),
12981298
};
1299-
handles.push(s.spawn(|_| worker.run()));
1299+
handles.push(s.spawn(|| worker.run()));
13001300
}
13011301
for handle in handles {
13021302
handle.join().unwrap();
13031303
}
1304-
})
1305-
.unwrap(); // Pass along panics from threads
1304+
});
13061305
}
13071306

13081307
fn threads(&self) -> usize {

0 commit comments

Comments
 (0)