Skip to content

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

refactor(config): move is_default to config module (#2115)

Maximilian Roos8c55b1c97df2
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 54931f147..f7643b999 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -85,6 +85,14 @@ impl std::fmt::Display for ConfigError {
impl std::error::Error for ConfigError {}
+/// Returns true if the given value equals `T::default()`.
+///
+/// Used as `skip_serializing_if` so section types like `ListConfig` /
+/// `MergeConfig` are omitted from serialized TOML when no fields are set.
+pub(crate) fn is_default<T: Default + PartialEq>(value: &T) -> bool {
+ *value == T::default()
+}
+
// Re-export public types
pub use approvals::{Approvals, approvals_path};
pub use commands::{Command, CommandConfig, HookStep, append_aliases};
diff --git a/src/config/project.rs b/src/config/project.rs
index fa99375c2..ccf298beb 100644
--- a/src/config/project.rs
+++ b/src/config/project.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
use super::ConfigError;
use super::commands::CommandConfig;
-use super::user::merge::is_default;
+use super::is_default;
use super::{CopyIgnoredConfig, HooksConfig, StepConfig};
/// Project-level configuration for `wt list` output.
diff --git a/src/config/user/merge.rs b/src/config/user/merge.rs
index dbe2448c3..0334276d7 100644
--- a/src/config/user/merge.rs
+++ b/src/config/user/merge.rs
@@ -26,11 +26,3 @@ pub fn merge_optional<T: Merge + Clone>(global: Option<&T>, project: Option<&T>)
(None, None) => None,
}
}
-
-/// Returns true if the given value equals `T::default()`.
-///
-/// Used as `skip_serializing_if` so section types like `ListConfig` /
-/// `MergeConfig` are omitted from serialized TOML when no fields are set.
-pub(crate) fn is_default<T: Default + PartialEq>(value: &T) -> bool {
- *value == T::default()
-}
diff --git a/src/config/user/mod.rs b/src/config/user/mod.rs
index 29ffca8e3..95a046ee4 100644
--- a/src/config/user/mod.rs
+++ b/src/config/user/mod.rs
@@ -3,7 +3,7 @@
//! Personal preferences and per-project approved commands, not checked into git.
mod accessors;
-pub(crate) mod merge;
+mod merge;
pub(crate) mod mutation;
mod path;
mod persistence;
@@ -294,23 +294,23 @@ pub struct UserConfig {
pub worktree_path: Option<String>,
/// Configuration for the `wt list` command
- #[serde(default, skip_serializing_if = "merge::is_default")]
+ #[serde(default, skip_serializing_if = "super::is_default")]
pub list: sections::ListConfig,
/// Configuration for the `wt step commit` command (also used by merge)
- #[serde(default, skip_serializing_if = "merge::is_default")]
+ #[serde(default, skip_serializing_if = "super::is_default")]
pub commit: sections::CommitConfig,
/// Configuration for the `wt merge` command
- #[serde(default, skip_serializing_if = "merge::is_default")]
+ #[serde(default, skip_serializing_if = "super::is_default")]
pub merge: sections::MergeConfig,
/// Configuration for the `wt switch` command
- #[serde(default, skip_serializing_if = "merge::is_default")]
+ #[serde(default, skip_serializing_if = "super::is_default")]
pub switch: sections::SwitchConfig,
/// Configuration for `wt step` subcommands
- #[serde(default, skip_serializing_if = "merge::is_default")]
+ #[serde(default, skip_serializing_if = "super::is_default")]
pub step: sections::StepConfig,
/// Command aliases for `wt step <name>`
diff --git a/src/config/user/sections.rs b/src/config/user/sections.rs
index 0e0d7fad0..14983a069 100644
--- a/src/config/user/sections.rs
+++ b/src/config/user/sections.rs
@@ -8,9 +8,10 @@ use std::collections::BTreeMap;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
-use super::merge::{Merge, is_default, merge_optional};
+use super::merge::{Merge, merge_optional};
use crate::config::HooksConfig;
use crate::config::commands::CommandConfig;
+use crate::config::is_default;
/// What to stage before committing
#[derive(