Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Update dependencies to latest versions
Maximilian Roos6118e917b55c
diff --git a/Cargo.lock b/Cargo.lockindex 5dc485e1c..49bf96c22 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -209,9 +209,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"[[package]]name = "cc"-version = "1.0.106"+version = "1.2.46"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2"+checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36"+dependencies = [+ "find-msvc-tools",+ "shlex",+][[package]]name = "cfg-if"@@ -783,6 +787,12 @@ dependencies = ["winapi",]+[[package]]+name = "find-msvc-tools"+version = "0.1.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"+[[package]]name = "fnv"version = "1.0.7"@@ -1155,6 +1165,18 @@ dependencies = ["libc",]+[[package]]+name = "nix"+version = "0.30.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"+dependencies = [+ "bitflags 2.10.0",+ "cfg-if",+ "cfg_aliases 0.2.1",+ "libc",+]+[[package]]name = "nohash-hasher"version = "0.2.0"@@ -1396,9 +1418,9 @@ dependencies = [[[package]]name = "quote"-version = "1.0.41"+version = "1.0.42"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"dependencies = ["proc-macro2",]@@ -1669,6 +1691,7 @@ version = "1.0.145"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"dependencies = [+ "indexmap","itoa","memchr","ryu",@@ -1819,6 +1842,12 @@ version = "0.4.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"+[[package]]+name = "streaming-iterator"+version = "0.1.9"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"+[[package]]name = "strip-ansi-escapes"version = "0.2.1"@@ -1857,9 +1886,9 @@ dependencies = [[[package]]name = "syn"-version = "2.0.108"+version = "2.0.110"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"dependencies = ["proc-macro2","quote",@@ -2076,35 +2105,46 @@ checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"[[package]]name = "tree-sitter"-version = "0.20.10"+version = "0.25.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"+checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87"dependencies = ["cc","regex",+ "regex-syntax",+ "serde_json",+ "streaming-iterator",+ "tree-sitter-language",][[package]]name = "tree-sitter-bash"-version = "0.20.5"+version = "0.25.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "57da2032c37eb2ce29fd18df7d3b94355fec8d6d854d8f80934955df542b5906"+checksum = "871b0606e667e98a1237ebdc1b0d7056e0aebfdc3141d12b399865d4cb6ed8a6"dependencies = ["cc",- "tree-sitter",+ "tree-sitter-language",][[package]]name = "tree-sitter-highlight"-version = "0.20.1"+version = "0.25.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "042342584c5a7a0b833d9fc4e2bdab3f9868ddc6c4b339a1e01451c6720868bc"+checksum = "adc5f880ad8d8f94e88cb81c3557024cf1a8b75e3b504c50481ed4f5a6006ff3"dependencies = ["regex",- "thiserror 1.0.69",+ "streaming-iterator",+ "thiserror 2.0.17","tree-sitter",]+[[package]]+name = "tree-sitter-language"+version = "0.1.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"+[[package]]name = "typeid"version = "1.0.3"@@ -2604,7 +2644,7 @@ dependencies = ["insta-cmd","log","minijinja",- "nix 0.29.0",+ "nix 0.30.1","portable-pty","rayon","regex",diff --git a/Cargo.toml b/Cargo.tomlindex 4492c75de..a55f5f133 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -48,7 +48,7 @@ clap_complete = { version = "4.5", features = ["unstable-dynamic"] }config = "0.15"directories = "6.0"env_logger = "0.11"-indexmap = { version = "2.8", features = ["serde"] }+indexmap = { version = "2.12", features = ["serde"] }etcetera = "0.11"log = "0.4"minijinja = "2.12"@@ -62,21 +62,19 @@ strum = { version = "0.27", features = ["derive"] }synoptic = "2"terminal_size = "0.4"toml = { version = "0.9", features = ["preserve_order"] }-# Using 0.20.x due to linking issues in 0.25.x with le16toh/be16toh on some platforms-# See: https://github.com/tree-sitter/tree-sitter/issues/4186# 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-tree-sitter = { version = "0.20", optional = true }-tree-sitter-bash = { version = "0.20", optional = true }-tree-sitter-highlight = { version = "0.20", optional = true }+tree-sitter = { version = "0.25", optional = true }+tree-sitter-bash = { version = "0.25", optional = true }+tree-sitter-highlight = { version = "0.25", optional = true }unicode-width = "0.2"[target.'cfg(unix)'.dependencies]skim = "0.20"# nix crate used by dev-detach helper binary for TTY isolation in tests.# This is only compiled when running tests (dev-detach is not included in release builds).-nix = { version = "0.29", default-features = false, features = ["process", "signal"] }+nix = { version = "0.30", default-features = false, features = ["process", "signal"] }[build-dependencies]vergen-gitcl = { version = "1.0.8", features = ["build"] }diff --git a/src/styling/format.rs b/src/styling/format.rsindex c0ac1efdf..d9078dbb5 100644--- a/src/styling/format.rs+++ b/src/styling/format.rs@@ -201,25 +201,29 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {"constant", // Constants/flags];- let bash_language = tree_sitter_bash::language();+ let bash_language = tree_sitter_bash::LANGUAGE.into();let bash_highlights = tree_sitter_bash::HIGHLIGHT_QUERY;- let mut config = HighlightConfiguration::new(+ let mut config = match HighlightConfiguration::new(bash_language,+ "bash", // language namebash_highlights,"", // injections query"", // locals query- )- .unwrap_or_else(|_| {- // Fallback: if tree-sitter fails, use plain gutter formatting- HighlightConfiguration::new(- bash_language,- "", // empty query- "",- "",- )- .unwrap()- });+ ) {+ Ok(config) => config,+ Err(_) => {+ // Fallback: if tree-sitter fails, use plain gutter formatting+ HighlightConfiguration::new(+ tree_sitter_bash::LANGUAGE.into(),+ "bash", // language name+ "", // empty query+ "",+ "",+ )+ .unwrap()+ }+ };config.configure(&highlight_names);diff --git a/tests/bin/dev-detach.rs b/tests/bin/dev-detach.rsindex 3017a38c4..0d135c682 100644--- a/tests/bin/dev-detach.rs+++ b/tests/bin/dev-detach.rs@@ -44,7 +44,7 @@ fn main() {// Replace this process with the target command.// If execvp returns, it failed.- let _ = execvp(&prog, &cargs);+ let _ = execvp(prog.as_c_str(), &cargs);eprintln!("dev-detach: execvp failed");process::exit(127);}