summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Thiel <sebastian.thiel@icloud.com>2022-12-15 12:37:09 +0100
committerSebastian Thiel <sebastian.thiel@icloud.com>2022-12-15 13:25:47 +0100
commit9bdf26a7dbb7577ea10e0eac970c081a7bfa66a6 (patch)
tree78e09e0254338317f76eb41246df7221971c361f
parent53a7d15a1e7bb0efb70264e9bebcb08cccfdb74a (diff)
uprgade to latest `jwalk` version for more hang-safety
-rw-r--r--Cargo.lock4
-rw-r--r--Cargo.toml2
-rw-r--r--src/common.rs4
3 files changed, 6 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4e395cc..274de2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -380,9 +380,9 @@ dependencies = [
[[package]]
name = "jwalk"
-version = "0.6.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dbcda57db8b6dc067e589628b7348639014e793d9e8137d8cf215e8b133a0bd"
+checksum = "37cb840f933b9fa56c78fde73acc9f2c883a2594fc6c791992a133468106965d"
dependencies = [
"crossbeam",
"rayon",
diff --git a/Cargo.toml b/Cargo.toml
index 505fd55..f991444 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ trash-move = ["trash"]
[dependencies]
clap = { version = "4.0.29", features = ["derive"] }
-jwalk = "0.6.2"
+jwalk = "0.8.0"
byte-unit = "4"
atty = "0.2.11"
petgraph = "0.6"
diff --git a/src/common.rs b/src/common.rs
index 71e60b7..45e9738 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -156,7 +156,9 @@ impl WalkOptions {
}
})
.parallelism(match self.threads {
- 0 => jwalk::Parallelism::RayonDefaultPool,
+ 0 => jwalk::Parallelism::RayonDefaultPool {
+ busy_timeout: std::time::Duration::from_secs(1),
+ },
1 => jwalk::Parallelism::Serial,
_ => jwalk::Parallelism::RayonNewPool(self.threads),
})