Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Update dependencies and replace `directories` crate

Maximilian Roosf0428f3a9ee7
diff --git a/Cargo.lock b/Cargo.lock
index cb063591f..4e61316ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -694,15 +694,6 @@ dependencies = [
"crypto-common",
]
-[[package]]
-name = "directories"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
-dependencies = [
- "dirs-sys",
-]
-
[[package]]
name = "dirs"
version = "6.0.0"
@@ -1570,7 +1561,7 @@ version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
dependencies = [
- "toml_edit 0.23.7",
+ "toml_edit",
]
[[package]]
@@ -1997,9 +1988,9 @@ dependencies = [
[[package]]
name = "signal-hook-registry"
-version = "1.4.6"
+version = "1.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
dependencies = [
"libc",
]
@@ -2111,9 +2102,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.110"
+version = "2.0.111"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
dependencies = [
"proc-macro2",
"quote",
@@ -2286,18 +2277,12 @@ dependencies = [
"indexmap",
"serde_core",
"serde_spanned",
- "toml_datetime 0.7.3",
+ "toml_datetime",
"toml_parser",
"toml_writer",
"winnow",
]
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-
[[package]]
name = "toml_datetime"
version = "0.7.3"
@@ -2307,18 +2292,6 @@ dependencies = [
"serde_core",
]
-[[package]]
-name = "toml_edit"
-version = "0.22.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
-dependencies = [
- "indexmap",
- "toml_datetime 0.6.11",
- "toml_write",
- "winnow",
-]
-
[[package]]
name = "toml_edit"
version = "0.23.7"
@@ -2326,8 +2299,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
dependencies = [
"indexmap",
- "toml_datetime 0.7.3",
+ "toml_datetime",
"toml_parser",
+ "toml_writer",
"winnow",
]
@@ -2340,12 +2314,6 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
[[package]]
name = "toml_writer"
version = "1.0.4"
@@ -2901,7 +2869,6 @@ dependencies = [
"criterion",
"crossbeam-channel",
"crossterm",
- "directories",
"env_logger",
"etcetera",
"fs2",
@@ -2912,7 +2879,6 @@ dependencies = [
"log",
"minijinja",
"nix 0.30.1",
- "once_cell",
"osc8",
"portable-pty",
"rayon",
@@ -2928,7 +2894,7 @@ dependencies = [
"tempfile",
"terminal_size",
"toml",
- "toml_edit 0.22.27",
+ "toml_edit",
"tree-sitter",
"tree-sitter-bash",
"tree-sitter-highlight",
diff --git a/Cargo.toml b/Cargo.toml
index c69831273..2282bb35c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,10 +45,8 @@ clap_complete = { version = "4.5", features = ["unstable-dynamic"] }
config = "0.15"
crossbeam-channel = "0.5"
crossterm = "0.29"
-directories = "6.0"
env_logger = "0.11"
indexmap = { version = "2.12", features = ["serde"] }
-once_cell = "1.21"
etcetera = "0.11"
log = "0.4"
minijinja = "2.12"
@@ -61,7 +59,7 @@ strum = { version = "0.27", features = ["derive"] }
synoptic = "2"
terminal_size = "0.4"
toml = { version = "0.9", features = ["preserve_order"] }
-toml_edit = "0.22"
+toml_edit = "0.23"
# All three crates must use the same version series to avoid native library conflicts
# These are optional dependencies controlled by the "syntax-highlighting" feature.
# To build without C compilation requirements, use: cargo install worktrunk --no-default-features
@@ -90,7 +88,6 @@ portable-pty = "0.9"
regex = "1.12"
vt100 = "0.16"
fs2 = "0.4"
-home = "0.5.12"
[[bench]]
name = "completion"
diff --git a/tests/integration_tests/approval_save.rs b/tests/integration_tests/approval_save.rs
index d124165bc..6b371d9a0 100644
--- a/tests/integration_tests/approval_save.rs
+++ b/tests/integration_tests/approval_save.rs
@@ -157,9 +157,9 @@ fn test_isolated_config_safety() {
let config_path = temp_dir.path().join("isolated.toml");
// Read user's actual config before test (if it exists)
- use directories::ProjectDirs;
- let user_config_path = if let Some(proj_dirs) = ProjectDirs::from("", "", "worktrunk") {
- proj_dirs.config_dir().join("config.toml")
+ use etcetera::base_strategy::{BaseStrategy, choose_base_strategy};
+ let user_config_path = if let Ok(strategy) = choose_base_strategy() {
+ strategy.config_dir().join("worktrunk").join("config.toml")
} else {
// Fallback for platforms where config dir can't be determined
std::env::var("HOME")