Skip to content

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

Remove unused `assert_cmd`, `difflib`, `predicates`, `termtree`

Maximilian Roos0f59a8515b04
diff --git a/Cargo.lock b/Cargo.lock
index dd0b22030..e9b7782b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -131,21 +131,6 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "assert_cmd"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85"
-dependencies = [
- "anstyle",
- "bstr",
- "libc",
- "predicates",
- "predicates-core",
- "predicates-tree",
- "wait-timeout",
-]
-
[[package]]
name = "async-trait"
version = "0.1.89"
@@ -615,12 +600,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "difflib"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
-
[[package]]
name = "digest"
version = "0.10.7"
@@ -1374,33 +1353,6 @@ dependencies = [
"zerocopy",
]
-[[package]]
-name = "predicates"
-version = "3.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
-dependencies = [
- "anstyle",
- "difflib",
- "predicates-core",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
[[package]]
name = "proc-macro-crate"
version = "3.4.0"
@@ -1949,12 +1901,6 @@ dependencies = [
"windows-sys 0.60.2",
]
-[[package]]
-name = "termtree"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
-
[[package]]
name = "thiserror"
version = "1.0.69"
@@ -2258,15 +2204,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "wait-timeout"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "walkdir"
version = "2.5.0"
@@ -2642,7 +2579,6 @@ dependencies = [
"anstream",
"anstyle",
"askama",
- "assert_cmd",
"chrono",
"clap",
"clap_complete",
diff --git a/Cargo.toml b/Cargo.toml
index 4d408be0e..2fe64eb36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,6 @@ vergen-gitcl = { version = "1.0.8", features = ["build"] }
[dev-dependencies]
insta = { version = "1.43", features = ["yaml", "redactions", "filters"] }
insta-cmd = "0.6"
-assert_cmd = "2.0"
rstest = "0.26"
tempfile = "3.23"
toml = "0.9"
diff --git a/src/git/semaphore.rs b/src/git/semaphore.rs
index 9f4216fa9..d1e582283 100644
--- a/src/git/semaphore.rs
+++ b/src/git/semaphore.rs
@@ -9,8 +9,6 @@ use std::sync::{Arc, Condvar, Mutex};
#[derive(Clone)]
pub struct Semaphore {
state: Arc<(Mutex<usize>, Condvar)>,
- #[allow(dead_code)]
- max_permits: usize,
}
/// RAII guard that releases a semaphore permit on drop.
@@ -23,7 +21,6 @@ impl Semaphore {
pub fn new(permits: usize) -> Self {
Self {
state: Arc::new((Mutex::new(permits), Condvar::new())),
- max_permits: permits,
}
}
@@ -46,24 +43,6 @@ impl Semaphore {
state: Arc::clone(&self.state),
}
}
-
- /// Try to acquire a permit without blocking.
- ///
- /// Returns Some(guard) if successful, None if no permits available.
- #[allow(dead_code)]
- pub fn try_acquire(&self) -> Option<SemaphoreGuard> {
- let (lock, _) = &*self.state;
- let mut available = lock.lock().unwrap();
-
- if *available > 0 {
- *available -= 1;
- Some(SemaphoreGuard {
- state: Arc::clone(&self.state),
- })
- } else {
- None
- }
- }
}
impl Drop for SemaphoreGuard {
@@ -121,20 +100,4 @@ mod tests {
// Should never have more than 2 threads running concurrently
assert!(max_concurrent.load(Ordering::SeqCst) <= 2);
}
-
- #[test]
- fn test_try_acquire() {
- let sem = Semaphore::new(1);
-
- let guard1 = sem.try_acquire();
- assert!(guard1.is_some());
-
- let guard2 = sem.try_acquire();
- assert!(guard2.is_none());
-
- drop(guard1);
-
- let guard3 = sem.try_acquire();
- assert!(guard3.is_some());
- }
}
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 9af105e7e..84be7e185 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -219,49 +219,6 @@ impl TestRepo {
.unwrap_or_else(|| panic!("Worktree '{}' not found", name))
}
- /// Read a file from the repo root
- #[allow(dead_code)]
- pub fn read_file(&self, path: &str) -> String {
- std::fs::read_to_string(self.root.join(path))
- .unwrap_or_else(|_| panic!("Failed to read {}", path))
- }
-
- /// List all files in the repository (excluding .git)
- #[allow(dead_code)]
- pub fn file_tree(&self) -> Vec<String> {
- let mut files = Vec::new();
- Self::collect_files(&self.root, "", &mut files);
- files.sort();
- files
- }
-
- #[allow(dead_code)]
- fn collect_files(dir: &Path, prefix: &str, files: &mut Vec<String>) {
- if let Ok(entries) = std::fs::read_dir(dir) {
- for entry in entries.flatten() {
- let path = entry.path();
- let name = entry.file_name();
-
- // Skip .git directory
- if name == ".git" {
- continue;
- }
-
- let display_name = if prefix.is_empty() {
- name.to_string_lossy().to_string()
- } else {
- format!("{}/{}", prefix, name.to_string_lossy())
- };
-
- if path.is_dir() {
- Self::collect_files(&path, &display_name, files);
- } else {
- files.push(display_name);
- }
- }
- }
- }
-
/// Create a commit with the given message
pub fn commit(&self, message: &str) {
// Create a file to ensure there's something to commit
@@ -460,12 +417,6 @@ impl TestRepo {
.expect("Failed to clear origin/HEAD");
}
- /// Get the path to the remote repository if one was set up
- #[allow(dead_code)]
- pub fn remote_path(&self) -> Option<&Path> {
- self.remote.as_deref()
- }
-
/// Check if origin/HEAD is set
pub fn has_origin_head(&self) -> bool {
let mut cmd = Command::new("git");