Skip to content

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

chore(deps): bump multiple dependencies

Maximilian Roos37eab1182f53
diff --git a/Cargo.lock b/Cargo.lock
index 280f9426a..2b023fe4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
[[package]]
name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
dependencies = [
"memchr",
]
@@ -127,13 +127,12 @@ dependencies = [
[[package]]
name = "assert_cmd"
-version = "2.0.17"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
+checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85"
dependencies = [
"anstyle",
"bstr",
- "doc-comment",
"libc",
"predicates",
"predicates-core",
@@ -281,9 +280,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.50"
+version = "4.5.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623"
+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
dependencies = [
"clap_builder",
"clap_derive",
@@ -291,9 +290,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.50"
+version = "4.5.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0"
+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
dependencies = [
"anstream",
"anstyle",
@@ -303,9 +302,9 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.59"
+version = "4.5.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2348487adcd4631696ced64ccdb40d38ac4d31cae7f2eec8817fcea1b9d1c43c"
+checksum = "8e602857739c5a4291dfa33b5a298aeac9006185229a700e5810a3ef7272d971"
dependencies = [
"clap",
]
@@ -614,12 +613,6 @@ dependencies = [
"const-random",
]
-[[package]]
-name = "doc-comment"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9"
-
[[package]]
name = "downcast-rs"
version = "1.2.1"
@@ -1551,6 +1544,7 @@ version = "1.0.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
dependencies = [
+ "indexmap",
"itoa",
"memchr",
"ryu",
@@ -1848,22 +1842,23 @@ checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
[[package]]
name = "tree-sitter"
-version = "0.24.7"
+version = "0.25.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75"
+checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87"
dependencies = [
"cc",
"regex",
"regex-syntax",
+ "serde_json",
"streaming-iterator",
"tree-sitter-language",
]
[[package]]
name = "tree-sitter-bash"
-version = "0.23.3"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "329a4d48623ac337d42b1df84e81a1c9dbb2946907c102ca72db158c1964a52e"
+checksum = "871b0606e667e98a1237ebdc1b0d7056e0aebfdc3141d12b399865d4cb6ed8a6"
dependencies = [
"cc",
"tree-sitter-language",
@@ -1871,14 +1866,13 @@ dependencies = [
[[package]]
name = "tree-sitter-highlight"
-version = "0.24.7"
+version = "0.25.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6411813e4a9ebc87d391b98b0f3ce65d5361cd80c54de8651d8b85b555ea5d95"
+checksum = "adc5f880ad8d8f94e88cb81c3557024cf1a8b75e3b504c50481ed4f5a6006ff3"
dependencies = [
- "lazy_static",
"regex",
"streaming-iterator",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
"tree-sitter",
]
@@ -1908,9 +1902,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
[[package]]
name = "unicode-ident"
-version = "1.0.20"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
[[package]]
name = "unicode-segmentation"
diff --git a/Cargo.toml b/Cargo.toml
index 94feef300..7168f879c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,9 +37,9 @@ shellexpand = "3.1"
synoptic = "2"
terminal_size = "0.4"
toml = "0.9"
-tree-sitter = "0.24"
-tree-sitter-bash = "0.23"
-tree-sitter-highlight = "0.24"
+tree-sitter = "0.25"
+tree-sitter-bash = "0.25"
+tree-sitter-highlight = "0.25"
unicode-width = "0.2"
[build-dependencies]
diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rs
index 46e4ea18a..f5944fbf2 100644
--- a/tests/integration_tests/completion.rs
+++ b/tests/integration_tests/completion.rs
@@ -1,8 +1,7 @@
use crate::common::TestRepo;
-use assert_cmd::Command;
use insta::Settings;
use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
-use std::process::Command as StdCommand;
+use std::process::Command;
#[test]
fn test_complete_switch_shows_branches() {
@@ -10,13 +9,13 @@ fn test_complete_switch_shows_branches() {
temp.commit("initial");
// Create some branches using git
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/new"])
.current_dir(temp.root_path())
.output()
.unwrap();
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "hotfix/bug"])
.current_dir(temp.root_path())
.output()
@@ -26,7 +25,7 @@ fn test_complete_switch_shows_branches() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "switch", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -51,7 +50,7 @@ fn test_complete_switch_shows_all_branches_including_worktrees() {
temp.add_worktree("feature-worktree", "feature/new");
// Create another branch without worktree
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "hotfix/bug"])
.current_dir(temp.root_path())
.output()
@@ -61,7 +60,7 @@ fn test_complete_switch_shows_all_branches_including_worktrees() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "switch", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -86,7 +85,7 @@ fn test_complete_push_shows_all_branches() {
temp.add_worktree("feature-worktree", "feature/new");
// Create another branch without worktree
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "hotfix/bug"])
.current_dir(temp.root_path())
.output()
@@ -96,7 +95,7 @@ fn test_complete_push_shows_all_branches() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "push", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -118,20 +117,20 @@ fn test_complete_base_flag_shows_all_branches() {
temp.commit("initial");
// Create branches
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "develop"])
.current_dir(temp.root_path())
.output()
.unwrap();
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/existing"])
.current_dir(temp.root_path())
.output()
.unwrap();
// Test completion for --base flag (long form)
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args([
@@ -155,7 +154,7 @@ fn test_complete_base_flag_shows_all_branches() {
assert!(branches.iter().any(|b| b.contains("feature/existing")));
// Test completion for -b flag (short form)
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args([
@@ -185,7 +184,7 @@ fn test_complete_outside_git_repo() {
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.path())
.args(["complete", "wt", "switch", ""]);
@@ -206,7 +205,7 @@ fn test_complete_empty_repo() {
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(repo.root_path())
.args(["complete", "wt", "switch", ""]);
@@ -228,7 +227,7 @@ fn test_complete_unknown_command() {
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(repo.root_path())
.args(["complete", "wt", "unknown-command", ""]);
@@ -250,7 +249,7 @@ fn test_complete_list_command() {
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(repo.root_path())
.args(["complete", "wt", "list", ""]);
@@ -267,7 +266,7 @@ fn test_complete_list_command() {
#[test]
fn test_init_fish_includes_no_file_flag() {
// Test that fish init includes -f flag to disable file completion
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd.arg("init").arg("fish").output().unwrap();
assert!(output.status.success());
@@ -283,19 +282,19 @@ fn test_complete_with_partial_prefix() {
temp.commit("initial");
// Create branches with common prefix
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/one"])
.current_dir(temp.root_path())
.output()
.unwrap();
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/two"])
.current_dir(temp.root_path())
.output()
.unwrap();
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "hotfix/bug"])
.current_dir(temp.root_path())
.output()
@@ -306,7 +305,7 @@ fn test_complete_with_partial_prefix() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "switch", "feat"]);
assert_cmd_snapshot!(cmd, @r"
@@ -333,7 +332,7 @@ fn test_complete_switch_shows_all_branches_even_with_worktrees() {
temp.add_worktree("hotfix-worktree", "hotfix/bug");
// From the main worktree, test completion - should show all branches
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args(["complete", "wt", "switch", ""])
@@ -354,14 +353,14 @@ fn test_complete_excludes_remote_branches() {
temp.commit("initial");
// Create local branches
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/local"])
.current_dir(temp.root_path())
.output()
.unwrap();
// Set up a fake remote
- StdCommand::new("git")
+ Command::new("git")
.args(["remote", "add", "origin", "https://example.com/repo.git"])
.current_dir(temp.root_path())
.output()
@@ -370,40 +369,40 @@ fn test_complete_excludes_remote_branches() {
// Create a remote-tracking branch by fetching from a local "remote"
// First, create a bare repo to act as remote
let remote_dir = temp.root_path().parent().unwrap().join("remote.git");
- StdCommand::new("git")
+ Command::new("git")
.args(["init", "--bare", remote_dir.to_str().unwrap()])
.output()
.unwrap();
// Update remote URL to point to our bare repo
- StdCommand::new("git")
+ Command::new("git")
.args(["remote", "set-url", "origin", remote_dir.to_str().unwrap()])
.current_dir(temp.root_path())
.output()
.unwrap();
// Push to create remote branches
- StdCommand::new("git")
+ Command::new("git")
.args(["push", "origin", "main"])
.current_dir(temp.root_path())
.output()
.unwrap();
- StdCommand::new("git")
+ Command::new("git")
.args(["push", "origin", "feature/local:feature/remote"])
.current_dir(temp.root_path())
.output()
.unwrap();
// Fetch to create remote-tracking branches
- StdCommand::new("git")
+ Command::new("git")
.args(["fetch", "origin"])
.current_dir(temp.root_path())
.output()
.unwrap();
// Test completion
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args(["complete", "wt", "switch", ""])
@@ -440,14 +439,14 @@ fn test_complete_merge_shows_branches() {
temp.add_worktree("feature-worktree", "feature/new");
// Create another branch without worktree
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "hotfix/bug"])
.current_dir(temp.root_path())
.output()
.unwrap();
// Test completion for merge (should show ALL branches, including those with worktrees)
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args(["complete", "wt", "merge", ""])
@@ -477,7 +476,7 @@ fn test_complete_with_special_characters_in_branch_names() {
];
for branch in &branch_names {
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", branch])
.current_dir(temp.root_path())
.output()
@@ -485,7 +484,7 @@ fn test_complete_with_special_characters_in_branch_names() {
}
// Test completion
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args(["complete", "wt", "switch", ""])
@@ -511,13 +510,13 @@ fn test_complete_stops_after_branch_provided() {
temp.commit("initial");
// Create branches
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/one"])
.current_dir(temp.root_path())
.output()
.unwrap();
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/two"])
.current_dir(temp.root_path())
.output()
@@ -527,7 +526,7 @@ fn test_complete_stops_after_branch_provided() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "switch", "feature/one", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -543,7 +542,7 @@ fn test_complete_stops_after_branch_provided() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "push", "feature/one", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -559,7 +558,7 @@ fn test_complete_stops_after_branch_provided() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "merge", "feature/one", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -577,7 +576,7 @@ fn test_complete_switch_with_create_flag_no_completion() {
let temp = TestRepo::new();
temp.commit("initial");
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "feature/existing"])
.current_dir(temp.root_path())
.output()
@@ -587,7 +586,7 @@ fn test_complete_switch_with_create_flag_no_completion() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "switch", "--create", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -603,7 +602,7 @@ fn test_complete_switch_with_create_flag_no_completion() {
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
settings.bind(|| {
- let mut cmd = StdCommand::new(get_cargo_bin("wt"));
+ let mut cmd = Command::new(get_cargo_bin("wt"));
cmd.current_dir(temp.root_path())
.args(["complete", "wt", "switch", "-c", ""]);
assert_cmd_snapshot!(cmd, @r"
@@ -622,14 +621,14 @@ fn test_complete_switch_base_flag_after_branch() {
temp.commit("initial");
// Create branches
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "develop"])
.current_dir(temp.root_path())
.output()
.unwrap();
// Test completion for --base even after --create and branch name
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args([
@@ -660,14 +659,14 @@ fn test_complete_remove_shows_branches() {
temp.add_worktree("feature-worktree", "feature/new");
// Create another branch without worktree
- StdCommand::new("git")
+ Command::new("git")
.args(["branch", "hotfix/bug"])
.current_dir(temp.root_path())
.output()
.unwrap();
// Test completion for remove (should show ALL branches)
- let mut cmd = Command::cargo_bin("wt").unwrap();
+ let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));
let output = cmd
.current_dir(temp.root_path())
.args(["complete", "wt", "remove", ""])
diff --git a/tests/integration_tests/completion_validation.rs b/tests/integration_tests/completion_validation.rs
index 6cac22188..24b3d3b35 100644
--- a/tests/integration_tests/completion_validation.rs
+++ b/tests/integration_tests/completion_validation.rs
@@ -1,5 +1,5 @@
-use assert_cmd::Command;
use std::collections::HashSet;
+use std::process::Command;
use worktrunk::styling::SUCCESS_EMOJI;
/// Issue found during validation
@@ -239,22 +239,19 @@ fn validate_cross_shell(fish_content: &str, bash_content: &str, zsh_content: &st
#[test]
fn test_completion_validation() {
// Generate completions
- let fish_output = Command::cargo_bin("wt")
- .unwrap()
+ let fish_output = Command::new(assert_cmd::cargo::cargo_bin!("wt"))
.arg("init")
.arg("fish")
.output()
.expect("Failed to generate fish completion");
- let bash_output = Command::cargo_bin("wt")
- .unwrap()
+ let bash_output = Command::new(assert_cmd::cargo::cargo_bin!("wt"))
.arg("init")
.arg("bash")
.output()
.expect("Failed to generate bash completion");
- let zsh_output = Command::cargo_bin("wt")
- .unwrap()
+ let zsh_output = Command::new(assert_cmd::cargo::cargo_bin!("wt"))
.arg("init")
.arg("zsh")
.output()