Skip to content

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

Refactor: Use `&Path` instead of `PathBuf` for `find_common_prefix`

Maximilian Roos19ac750e5ac4
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index c47fddd36..4ac0564bc 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -1,5 +1,5 @@
use crate::display::{find_common_prefix, get_terminal_width};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
use unicode_width::UnicodeWidthStr;
use super::WorktreeInfo;
@@ -120,7 +120,7 @@ pub fn calculate_column_widths(infos: &[WorktreeInfo]) -> ColumnWidths {
/// Calculate responsive layout based on terminal width
pub fn calculate_responsive_layout(infos: &[WorktreeInfo]) -> LayoutConfig {
let terminal_width = get_terminal_width();
- let paths: Vec<PathBuf> = infos.iter().map(|info| info.path.clone()).collect();
+ let paths: Vec<&Path> = infos.iter().map(|info| info.path.as_path()).collect();
let common_prefix = find_common_prefix(&paths);
// Count how many rows have each sparse column
diff --git a/src/display.rs b/src/display.rs
index 496422a91..974da8434 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -127,17 +127,17 @@ pub fn format_relative_time(timestamp: i64) -> String {
}
/// Find the common prefix among all paths
-pub fn find_common_prefix(paths: &[PathBuf]) -> PathBuf {
+pub fn find_common_prefix<P: AsRef<Path>>(paths: &[P]) -> PathBuf {
if paths.is_empty() {
return PathBuf::new();
}
- let first = &paths[0];
+ let first = paths[0].as_ref();
let mut prefix = PathBuf::new();
for component in first.components() {
let candidate = prefix.join(component);
- if paths.iter().all(|p| p.starts_with(&candidate)) {
+ if paths.iter().all(|p| p.as_ref().starts_with(&candidate)) {
prefix = candidate;
} else {
break;