Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Improve status symbol serialization to use strum
Maximilian Roos2919ec8b730f
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex de3726455..7c087f117 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -288,8 +288,9 @@ impl ListItem {/// Main branch divergence state////// Represents relationship to the main/primary branch.-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]pub enum MainDivergence {+ #[strum(serialize = "")]/// Up to date with main branch#[default]None,@@ -343,8 +344,9 @@ impl MainDivergence {/// Upstream/remote divergence state////// Represents relationship to the remote tracking branch.-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]pub enum UpstreamDivergence {+ #[strum(serialize = "")]/// Up to date with remote#[default]None,@@ -399,8 +401,9 @@ impl UpstreamDivergence {/// 4. MergeTreeConflicts (⚠) - potential problem/// 5. MatchesMain (≡) - removable/// 6. NoCommits (∅) - removable-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]pub enum BranchOpState {+ #[strum(serialize = "")]/// Normal working branch#[default]None,@@ -758,31 +761,10 @@ impl serde::Serialize for StatusSymbols {use serde::ser::SerializeStruct;let mut state = serializer.serialize_struct("StatusSymbols", 2)?;- // Status variant names- let branch_op_state_variant = match self.branch_op_state {- BranchOpState::None => "",- BranchOpState::Conflicts => "Conflicts",- BranchOpState::Rebase => "Rebase",- BranchOpState::Merge => "Merge",- BranchOpState::MergeTreeConflicts => "MergeTreeConflicts",- BranchOpState::MatchesMain => "MatchesMain",- BranchOpState::NoCommits => "NoCommits",- };-- let main_divergence_variant = match self.main_divergence {- MainDivergence::None => "",- MainDivergence::IsMain => "IsMain",- MainDivergence::Ahead => "Ahead",- MainDivergence::Behind => "Behind",- MainDivergence::Diverged => "Diverged",- };-- let upstream_divergence_variant = match self.upstream_divergence {- UpstreamDivergence::None => "",- UpstreamDivergence::Ahead => "Ahead",- UpstreamDivergence::Behind => "Behind",- UpstreamDivergence::Diverged => "Diverged",- };+ // Status variant names (derived via strum::IntoStaticStr)+ let branch_op_state_variant: &'static str = self.branch_op_state.into();+ let main_divergence_variant: &'static str = self.main_divergence.into();+ let upstream_divergence_variant: &'static str = self.upstream_divergence.into();// Worktree state: ⎇ = Branch, ⌫ = Prunable, ⊠ = Lockedlet worktree_state_variant = if self.worktree_state.contains('⌫') {