Skip to content

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

fix: address norm violations from #2122 (#2123)

Worktrunk Bot710899b63121
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 11df1d062..eb0550181 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1649,8 +1649,7 @@ remove-db = "docker stop {{ repo }}-{{ branch | sanitize }}-postgres 2>/dev/null
/// Manage user & project configs
///
/// Includes shell integration, hooks, and saved state.
- #[command(
- after_long_help = concat!(r#"## Examples
+ #[command(after_long_help = r#"## Examples
Install shell integration (required for directory switching):
@@ -2136,8 +2135,7 @@ $ WORKTRUNK_COMMIT__GENERATION__COMMAND="echo 'test: automated commit'" wt merge
| `NO_COLOR` | Disable colored output ([standard](https://no-color.org/)) |
| `CLICOLOR_FORCE` | Force colored output even when not a TTY |
<!-- subdoc: show -->
-<!-- subdoc: state -->"#)
- )]
+<!-- subdoc: state -->"#)]
Config {
#[command(subcommand)]
action: ConfigCommand,
diff --git a/src/commands/list/model/state.rs b/src/commands/list/model/state.rs
index b5a2e82b4..d3966b076 100644
--- a/src/commands/list/model/state.rs
+++ b/src/commands/list/model/state.rs
@@ -273,23 +273,9 @@ pub enum Tier<T> {
Wait,
}
-impl<T> Tier<T> {
- /// Convert to `Option`, treating `Wait` and `RuledOut` both as `None`.
- /// Callers use this at the bottom of a tier chain when they've run out
- /// of tiers and need to collapse the result.
- #[allow(dead_code)] // Used by `refresh_status_symbols` (step 4).
- pub fn or_none(self) -> Option<T> {
- match self {
- Self::Fired(v) => Some(v),
- Self::RuledOut | Self::Wait => None,
- }
- }
-}
-
/// Tier 1: `IsMain`. Resolves immediately since `is_main` is metadata.
///
/// Returns `Fired(IsMain)` for main worktrees, `RuledOut` otherwise.
-#[allow(dead_code)] // Used by `refresh_status_symbols` (step 4).
pub fn tier_is_main(is_main: bool) -> Tier<MainState> {
if is_main {
Tier::Fired(MainState::IsMain)
@@ -304,7 +290,6 @@ pub fn tier_is_main(is_main: bool) -> Tier<MainState> {
/// every lower-priority signal (ahead/behind, integration, conflict) is
/// meaningless for them. Once we know `is_orphan == Some(true)`, the gate
/// short-circuits without needing anything else.
-#[allow(dead_code)] // Used by `refresh_status_symbols` (step 4).
pub fn tier_orphan(is_orphan: Option<bool>) -> Tier<MainState> {
match is_orphan {
Some(true) => Tier::Fired(MainState::Orphan),
@@ -333,7 +318,6 @@ pub fn tier_orphan(is_orphan: Option<bool>) -> Tier<MainState> {
/// - If both report "no conflict" (HEAD probe `Some(false)` and
/// working-tree probe either `Some(None)` or `Some(Some(false))`), rule
/// out.
-#[allow(dead_code)] // Used by `refresh_status_symbols` (step 4).
pub fn tier_would_conflict(
has_merge_tree_conflicts: Option<bool>,
has_working_tree_conflicts: Option<Option<bool>>,
@@ -370,7 +354,6 @@ pub fn tier_would_conflict(
/// may be `MainState::None` when there's nothing to display, which
/// callers should still treat as a resolved gate.)
/// - `Wait` if either `counts` or `is_clean` is still loading.
-#[allow(dead_code)] // Used by `refresh_status_symbols` (step 4).
pub fn tier_integration_or_counts(
counts: Option<super::stats::AheadBehind>,
is_clean: Option<bool>,
diff --git a/src/commands/list/model/status_symbols.rs b/src/commands/list/model/status_symbols.rs
index 45aae1977..20198b363 100644
--- a/src/commands/list/model/status_symbols.rs
+++ b/src/commands/list/model/status_symbols.rs
@@ -492,32 +492,6 @@ impl StatusSymbols {
result
}
- /// True iff every gate is either unresolved (`None`) or resolved to a
- /// "nothing to display" variant. Used by the in-file tests as a
- /// sanity check for the `Default` / `None`-variant semantics of the
- /// gate outputs. Non-test code no longer needs this predicate — the
- /// renderer emits per-position placeholders rather than branching
- /// on a cell-level empty check.
- #[cfg(test)]
- pub fn is_empty(&self) -> bool {
- let main_empty = self.main_state.is_none_or(|s| s == MainState::None);
- let op_empty = self
- .operation_state
- .is_none_or(|s| s == OperationState::None);
- let wt_state_empty = self.worktree_state.is_none_or(|s| s == WorktreeState::None);
- let upstream_empty = self
- .upstream_divergence
- .is_none_or(|s| s == Divergence::None);
- let working_tree_empty = self.working_tree.is_none_or(|wt| !wt.is_dirty());
- let user_marker_empty = self.user_marker.as_ref().is_none_or(|m| m.is_none());
- main_empty
- && op_empty
- && wt_state_empty
- && upstream_empty
- && working_tree_empty
- && user_marker_empty
- }
-
/// Render status symbols in compact form for statusline (no grid alignment).
///
/// Uses the same styled symbols as `render_with_mask()`, just without padding.
@@ -660,6 +634,24 @@ mod tests {
use super::*;
+ /// True iff every gate is either unresolved (`None`) or resolved to a
+ /// "nothing to display" variant. Sanity check for `Default` /
+ /// `None`-variant semantics of gate outputs.
+ fn is_empty(s: &StatusSymbols) -> bool {
+ let main_empty = s.main_state.is_none_or(|s| s == MainState::None);
+ let op_empty = s.operation_state.is_none_or(|s| s == OperationState::None);
+ let wt_state_empty = s.worktree_state.is_none_or(|s| s == WorktreeState::None);
+ let upstream_empty = s.upstream_divergence.is_none_or(|s| s == Divergence::None);
+ let working_tree_empty = s.working_tree.is_none_or(|wt| !wt.is_dirty());
+ let user_marker_empty = s.user_marker.as_ref().is_none_or(|m| m.is_none());
+ main_empty
+ && op_empty
+ && wt_state_empty
+ && upstream_empty
+ && working_tree_empty
+ && user_marker_empty
+ }
+
#[test]
fn test_working_tree_status_is_dirty() {
// Empty status is not dirty
@@ -721,43 +713,43 @@ mod tests {
#[test]
fn test_status_symbols_is_empty() {
let symbols = StatusSymbols::default();
- assert!(symbols.is_empty());
+ assert!(is_empty(&symbols));
let symbols = StatusSymbols {
main_state: Some(MainState::Ahead),
..Default::default()
};
- assert!(!symbols.is_empty());
+ assert!(!is_empty(&symbols));
let symbols = StatusSymbols {
operation_state: Some(OperationState::Rebase),
..Default::default()
};
- assert!(!symbols.is_empty());
+ assert!(!is_empty(&symbols));
let symbols = StatusSymbols {
worktree_state: Some(WorktreeState::Locked),
..Default::default()
};
- assert!(!symbols.is_empty());
+ assert!(!is_empty(&symbols));
let symbols = StatusSymbols {
upstream_divergence: Some(Divergence::Ahead),
..Default::default()
};
- assert!(!symbols.is_empty());
+ assert!(!is_empty(&symbols));
let symbols = StatusSymbols {
working_tree: Some(WorkingTreeStatus::new(true, false, false, false, false)),
..Default::default()
};
- assert!(!symbols.is_empty());
+ assert!(!is_empty(&symbols));
let symbols = StatusSymbols {
user_marker: Some(Some("🔥".to_string())),
..Default::default()
};
- assert!(!symbols.is_empty());
+ assert!(!is_empty(&symbols));
// Gates resolved to the "None" variant are still is_empty == true
// (resolved, but nothing to show). This matches the pre-step-2
@@ -770,7 +762,7 @@ mod tests {
working_tree: Some(WorkingTreeStatus::default()),
user_marker: Some(None),
};
- assert!(symbols.is_empty());
+ assert!(is_empty(&symbols));
}
#[test]
diff --git a/src/config/approvals.rs b/src/config/approvals.rs
index 33656d1e7..b9d2bccd4 100644
--- a/src/config/approvals.rs
+++ b/src/config/approvals.rs
@@ -116,15 +116,6 @@ impl Approvals {
Ok(approvals)
}
- /// Load approvals from a specific path (no fallback, for testing).
- #[cfg(test)]
- pub fn load_from_path(path: &Path) -> Result<Self, ConfigError> {
- if !path.exists() {
- return Ok(Self::default());
- }
- Self::load_from_file(path)
- }
-
/// Load approvals from an approvals file, falling back to config.toml.
///
/// 1. If the approvals file exists → load from it (authoritative)
@@ -403,6 +394,14 @@ mod tests {
(temp_dir, approvals_path)
}
+ /// Load approvals from a specific path (no fallback).
+ fn load_from_path(path: &Path) -> Result<Approvals, ConfigError> {
+ if !path.exists() {
+ return Ok(Approvals::default());
+ }
+ Approvals::load_from_file(path)
+ }
+
#[test]
fn test_empty_approvals() {
let approvals = Approvals::default();
@@ -538,7 +537,7 @@ mod tests {
.unwrap();
// Load from disk
- let loaded = Approvals::load_from_path(&path).unwrap();
+ let loaded = load_from_path(&path).unwrap();
assert!(loaded.is_command_approved("github.com/user/repo", "npm install"));
assert!(loaded.is_command_approved("github.com/user/repo", "npm test"));
}
@@ -693,7 +692,7 @@ approved-commands = ["npm install"]
fn test_load_from_path_nonexistent() {
let temp_dir = TempDir::new().unwrap();
let path = temp_dir.path().join("nonexistent.toml");
- let approvals = Approvals::load_from_path(&path).unwrap();
+ let approvals = load_from_path(&path).unwrap();
assert!(approvals.projects.is_empty());
}
diff --git a/src/git/repository/diff.rs b/src/git/repository/diff.rs
index 62091a871..eba9856a2 100644
--- a/src/git/repository/diff.rs
+++ b/src/git/repository/diff.rs
@@ -295,8 +295,7 @@ impl Repository {
let sparse_paths = self.sparse_checkout_paths();
let use_cache = sparse_paths.is_empty();
- if use_cache
- && let Some(cached) = super::sha_cache::get_diff_stats(self, &base_sha, &head_sha)
+ if use_cache && let Some(cached) = super::sha_cache::diff_stats(self, &base_sha, &head_sha)
{
return Ok(cached);
}
diff --git a/src/git/repository/integration.rs b/src/git/repository/integration.rs
index d8ff9a7c3..a5aa3b591 100644
--- a/src/git/repository/integration.rs
+++ b/src/git/repository/integration.rs
@@ -62,7 +62,7 @@ impl Repository {
let base_sha = self.rev_parse_commit(&base)?;
let head_sha = self.rev_parse_commit(&head)?;
- if let Some(cached) = super::sha_cache::get_is_ancestor(self, &base_sha, &head_sha) {
+ if let Some(cached) = super::sha_cache::is_ancestor(self, &base_sha, &head_sha) {
return Ok(cached);
}
@@ -101,9 +101,7 @@ impl Repository {
let branch_sha = self.rev_parse_commit(&branch)?;
let target_sha = self.rev_parse_commit(&target)?;
- if let Some(cached) =
- super::sha_cache::get_has_added_changes(self, &branch_sha, &target_sha)
- {
+ if let Some(cached) = super::sha_cache::has_added_changes(self, &branch_sha, &target_sha) {
return Ok(cached);
}
@@ -169,7 +167,7 @@ impl Repository {
let base_sha = self.rev_parse_commit(&base)?;
let head_sha = self.rev_parse_commit(&head)?;
- if let Some(cached) = super::sha_cache::get_merge_conflicts(self, &base_sha, &head_sha) {
+ if let Some(cached) = super::sha_cache::merge_conflicts(self, &base_sha, &head_sha) {
return Ok(cached);
}
@@ -198,7 +196,7 @@ impl Repository {
let base_sha = self.rev_parse_commit(&base)?;
let cache_head = format!("{branch_head_sha}+{tree_sha}");
- if let Some(cached) = super::sha_cache::get_merge_conflicts(self, &base_sha, &cache_head) {
+ if let Some(cached) = super::sha_cache::merge_conflicts(self, &base_sha, &cache_head) {
return Ok(cached);
}
@@ -362,8 +360,7 @@ impl Repository {
let branch_sha = self.rev_parse_commit(&branch)?;
let target_sha = self.rev_parse_commit(&target)?;
- if let Some(cached) = super::sha_cache::get_merge_add_probe(self, &branch_sha, &target_sha)
- {
+ if let Some(cached) = super::sha_cache::merge_add_probe(self, &branch_sha, &target_sha) {
return Ok(cached);
}
diff --git a/src/git/repository/sha_cache.rs b/src/git/repository/sha_cache.rs
index db2677ec3..21ae1395a 100644
--- a/src/git/repository/sha_cache.rs
+++ b/src/git/repository/sha_cache.rs
@@ -179,7 +179,7 @@ fn sweep_lru(dir: &Path, max: usize) {
/// Look up a cached `has_merge_conflicts(sha1, sha2)` result.
///
/// The key is order-independent: `(A, B)` and `(B, A)` hit the same entry.
-pub(super) fn get_merge_conflicts(repo: &Repository, sha1: &str, sha2: &str) -> Option<bool> {
+pub(super) fn merge_conflicts(repo: &Repository, sha1: &str, sha2: &str) -> Option<bool> {
let path = cache_dir(repo, KIND_MERGE_TREE_CONFLICTS).join(symmetric_key(sha1, sha2));
read::<bool>(&path)
}
@@ -201,7 +201,7 @@ pub(super) fn put_merge_conflicts(repo: &Repository, sha1: &str, sha2: &str, val
///
/// The key is order-dependent: the merge result is compared against
/// `target`'s tree, so swapping arguments changes the semantics.
-pub(super) fn get_merge_add_probe(
+pub(super) fn merge_add_probe(
repo: &Repository,
branch_sha: &str,
target_sha: &str,
@@ -231,7 +231,7 @@ pub(super) fn put_merge_add_probe(
/// Look up a cached `is_ancestor(base_sha, head_sha)` result.
///
/// Asymmetric: "is base ancestor of head?" differs from "is head ancestor of base?".
-pub(super) fn get_is_ancestor(repo: &Repository, base_sha: &str, head_sha: &str) -> Option<bool> {
+pub(super) fn is_ancestor(repo: &Repository, base_sha: &str, head_sha: &str) -> Option<bool> {
let path = cache_dir(repo, KIND_IS_ANCESTOR).join(asymmetric_key(base_sha, head_sha));
read::<bool>(&path)
}
@@ -251,7 +251,7 @@ pub(super) fn put_is_ancestor(repo: &Repository, base_sha: &str, head_sha: &str,
/// Look up a cached `has_added_changes(branch_sha, target_sha)` result.
///
/// Asymmetric: diff from merge-base to branch is directional.
-pub(super) fn get_has_added_changes(
+pub(super) fn has_added_changes(
repo: &Repository,
branch_sha: &str,
target_sha: &str,
@@ -280,11 +280,7 @@ pub(super) fn put_has_added_changes(
/// Look up cached `branch_diff_stats(base_sha, head_sha)` result.
///
/// Asymmetric: diff from merge-base(base,head)..head is directional.
-pub(super) fn get_diff_stats(
- repo: &Repository,
- base_sha: &str,
- head_sha: &str,
-) -> Option<LineDiff> {
+pub(super) fn diff_stats(repo: &Repository, base_sha: &str, head_sha: &str) -> Option<LineDiff> {
let path = cache_dir(repo, KIND_DIFF_STATS).join(asymmetric_key(base_sha, head_sha));
read::<LineDiff>(&path)
}
@@ -351,17 +347,17 @@ mod tests {
let test = TestRepo::with_initial_commit();
let repo = Repository::at(test.root_path()).unwrap();
- assert_eq!(get_merge_conflicts(&repo, "aaaa", "bbbb"), None);
+ assert_eq!(merge_conflicts(&repo, "aaaa", "bbbb"), None);
put_merge_conflicts(&repo, "aaaa", "bbbb", true);
- assert_eq!(get_merge_conflicts(&repo, "aaaa", "bbbb"), Some(true));
+ assert_eq!(merge_conflicts(&repo, "aaaa", "bbbb"), Some(true));
// Symmetric: swapped args hit the same entry
- assert_eq!(get_merge_conflicts(&repo, "bbbb", "aaaa"), Some(true));
+ assert_eq!(merge_conflicts(&repo, "bbbb", "aaaa"), Some(true));
// Overwrite with a new value
put_merge_conflicts(&repo, "aaaa", "bbbb", false);
- assert_eq!(get_merge_conflicts(&repo, "aaaa", "bbbb"), Some(false));
+ assert_eq!(merge_conflicts(&repo, "aaaa", "bbbb"), Some(false));
}
#[test]
@@ -369,17 +365,17 @@ mod tests {
let test = TestRepo::with_initial_commit();
let repo = Repository::at(test.root_path()).unwrap();
- assert_eq!(get_merge_add_probe(&repo, "aaaa", "bbbb"), None);
+ assert_eq!(merge_add_probe(&repo, "aaaa", "bbbb"), None);
let value = MergeProbeResult {
would_merge_add: true,
is_patch_id_match: false,
};
put_merge_add_probe(&repo, "aaaa", "bbbb", value);
- assert_eq!(get_merge_add_probe(&repo, "aaaa", "bbbb"), Some(value));
+ assert_eq!(merge_add_probe(&repo, "aaaa", "bbbb"), Some(value));
// Asymmetric: swapped args miss
- assert_eq!(get_merge_add_probe(&repo, "bbbb", "aaaa"), None);
+ assert_eq!(merge_add_probe(&repo, "bbbb", "aaaa"), None);
}
#[test]
@@ -389,7 +385,7 @@ mod tests {
put_merge_conflicts(&repo, "aaaa", "bbbb", true);
// Same SHA pair in a different kind is a separate entry
- assert_eq!(get_merge_add_probe(&repo, "aaaa", "bbbb"), None);
+ assert_eq!(merge_add_probe(&repo, "aaaa", "bbbb"), None);
}
#[test]
@@ -402,7 +398,7 @@ mod tests {
let path = cache_dir(&repo, KIND_MERGE_TREE_CONFLICTS).join(symmetric_key("aaaa", "bbbb"));
fs::write(&path, "not valid json {{{").unwrap();
- assert_eq!(get_merge_conflicts(&repo, "aaaa", "bbbb"), None);
+ assert_eq!(merge_conflicts(&repo, "aaaa", "bbbb"), None);
}
// LRU sweep
@@ -645,13 +641,13 @@ mod tests {
let test = TestRepo::with_initial_commit();
let repo = Repository::at(test.root_path()).unwrap();
- assert_eq!(get_is_ancestor(&repo, "aaaa", "bbbb"), None);
+ assert_eq!(is_ancestor(&repo, "aaaa", "bbbb"), None);
put_is_ancestor(&repo, "aaaa", "bbbb", true);
- assert_eq!(get_is_ancestor(&repo, "aaaa", "bbbb"), Some(true));
+ assert_eq!(is_ancestor(&repo, "aaaa", "bbbb"), Some(true));
// Asymmetric: swapped args miss
- assert_eq!(get_is_ancestor(&repo, "bbbb", "aaaa"), None);
+ assert_eq!(is_ancestor(&repo, "bbbb", "aaaa"), None);
}
#[test]
@@ -659,13 +655,13 @@ mod tests {
let test = TestRepo::with_initial_commit();
let repo = Repository::at(test.root_path()).unwrap();
- assert_eq!(get_has_added_changes(&repo, "aaaa", "bbbb"), None);
+ assert_eq!(has_added_changes(&repo, "aaaa", "bbbb"), None);
put_has_added_changes(&repo, "aaaa", "bbbb", false);
- assert_eq!(get_has_added_changes(&repo, "aaaa", "bbbb"), Some(false));
+ assert_eq!(has_added_changes(&repo, "aaaa", "bbbb"), Some(false));
// Asymmetric: swapped args miss
- assert_eq!(get_has_added_changes(&repo, "bbbb", "aaaa"), None);
+ assert_eq!(has_added_changes(&repo, "bbbb", "aaaa"), None);
}
#[test]
@@ -673,17 +669,17 @@ mod tests {
let test = TestRepo::with_initial_commit();
let repo = Repository::at(test.root_path()).unwrap();
- assert_eq!(get_diff_stats(&repo, "aaaa", "bbbb"), None);
+ assert_eq!(diff_stats(&repo, "aaaa", "bbbb"), None);
let value = LineDiff {
added: 42,
deleted: 7,
};
put_diff_stats(&repo, "aaaa", "bbbb", value);
- assert_eq!(get_diff_stats(&repo, "aaaa", "bbbb"), Some(value));
+ assert_eq!(diff_stats(&repo, "aaaa", "bbbb"), Some(value));
// Asymmetric: swapped args miss
- assert_eq!(get_diff_stats(&repo, "bbbb", "aaaa"), None);
+ assert_eq!(diff_stats(&repo, "bbbb", "aaaa"), None);
}
// Cache consultation: is_ancestor, has_added_changes, branch_diff_stats
@@ -815,10 +811,10 @@ mod tests {
assert_eq!(cleared, 5, "should clear one entry per kind");
// All kinds should be empty
- assert_eq!(get_merge_conflicts(&repo, "a", "b"), None);
- assert_eq!(get_merge_add_probe(&repo, "a", "b"), None);
- assert_eq!(get_is_ancestor(&repo, "a", "b"), None);
- assert_eq!(get_has_added_changes(&repo, "a", "b"), None);
- assert_eq!(get_diff_stats(&repo, "a", "b"), None);
+ assert_eq!(merge_conflicts(&repo, "a", "b"), None);
+ assert_eq!(merge_add_probe(&repo, "a", "b"), None);
+ assert_eq!(is_ancestor(&repo, "a", "b"), None);
+ assert_eq!(has_added_changes(&repo, "a", "b"), None);
+ assert_eq!(diff_stats(&repo, "a", "b"), None);
}
}
diff --git a/src/llm.rs b/src/llm.rs
index 38d1849f7..4956d4b1d 100644
--- a/src/llm.rs
+++ b/src/llm.rs
@@ -366,10 +366,7 @@ fn load_template(
eprintln!(
"{}",
warning_message(format!(
- "{} is deprecated and will be removed in a future release. \
- Use inline template instead. To request this feature, comment on: \
- https://github.com/max-sixty/worktrunk/issues/444",
- file_type_name
+ "{file_type_name} is deprecated and will be removed in a future release. Use inline template instead. To request this feature, comment on: https://github.com/max-sixty/worktrunk/issues/444"
))
);
}
diff --git a/src/output/commit_generation.rs b/src/output/commit_generation.rs
index 39ba83939..3249a0966 100644
--- a/src/output/commit_generation.rs
+++ b/src/output/commit_generation.rs
@@ -107,12 +107,10 @@ fn command_exists(cmd: &str) -> bool {
#[cfg(not(windows))]
let check_cmd = "which";
- std::process::Command::new(check_cmd)
+ worktrunk::shell_exec::Cmd::new(check_cmd)
.arg(cmd)
- .stdout(std::process::Stdio::null())
- .stderr(std::process::Stdio::null())
- .status()
- .map(|s| s.success())
+ .run()
+ .map(|output| output.status.success())
.unwrap_or(false)
}
diff --git a/src/styling/mod.rs b/src/styling/mod.rs
index f1eedb435..26527927a 100644
--- a/src/styling/mod.rs
+++ b/src/styling/mod.rs
@@ -113,14 +113,14 @@ pub fn terminal_width() -> usize {
/// (like "Approaching context limit").
#[cfg(unix)]
fn detect_parent_tty_width() -> Option<usize> {
- use std::process::Command;
+ use crate::shell_exec::Cmd;
let mut pid = std::process::id().to_string();
for _ in 0..10 {
- let output = Command::new("ps")
+ let output = Cmd::new("ps")
.args(["-o", "ppid=,tty=", "-p", &pid])
- .output()
+ .run()
.ok()?;
let info = String::from_utf8_lossy(&output.stdout);
@@ -131,9 +131,9 @@ fn detect_parent_tty_width() -> Option<usize> {
// Valid TTY found (not "?" or "??")
if !tty.is_empty() && tty != "?" && tty != "??" {
// Query TTY size using stty
- let size = Command::new("sh")
+ let size = Cmd::new("sh")
.args(["-c", &format!("stty size < /dev/{tty}")])
- .output()
+ .run()
.ok()?;
let cols = String::from_utf8_lossy(&size.stdout)