refactor: derive_more full + smart-default cleanups (#10)

markovejnovic · web-flow · commit f04ea2d0be19 · 2026-05-23T19:06:28.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,8 @@ semver      = { version = "1", features = ["serde"] }
 uuid        = { version = "1", features = ["serde", "v4"] }
 chrono      = { version = "0.4", features = ["serde"] }
 thiserror   = "2"
-derive_more = { version = "1", default-features = false, features = ["deref", "from", "display"] }
+derive_more = { version = "1", default-features = false, features = ["full"] }
+smart-default = "0.7"
 tokio       = { version = "1", features = ["full"] }
 tokio-util  = { version = "0.7", features = ["rt"] }
 extism      = "1"
diff --git a/crates/hm-plugin-docker/src/image_name.rs b/crates/hm-plugin-docker/src/image_name.rs
@@ -25,10 +25,10 @@ pub(crate) fn resolve_image(
     parent_snapshot: Option<&SnapshotRef>,
 ) -> String {
     if let Some(tag) = hit_tag {
-        return tag.0.clone();
+        return tag.to_string();
     }
     if let Some(snap) = parent_snapshot {
-        return snap.0.clone();
+        return snap.to_string();
     }
     if let Some(image) = &step.image {
         return image.clone();
diff --git a/crates/hm-plugin-docker/src/lib.rs b/crates/hm-plugin-docker/src/lib.rs
@@ -134,7 +134,7 @@ fn run_step(input: ExecutorInput) -> Result<StepResult, PluginError> {
         });
         match host::commit(DockerCommitArgs {
             container_id: cid.clone(),
-            tag: target_tag.0.clone(),
+            tag: target_tag.to_string(),
         }) {
             Ok(_) => Some(target_tag),
             Err(e) => {
diff --git a/crates/hm-plugin-protocol/src/events.rs b/crates/hm-plugin-protocol/src/events.rs
@@ -9,14 +9,14 @@ use uuid::Uuid;
 
 use crate::executor::SnapshotRef;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(rename_all = "snake_case")]
 pub enum StdStream {
     Stdout,
     Stderr,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum BuildEvent {
     BuildStart {
diff --git a/crates/hm-plugin-protocol/src/executor.rs b/crates/hm-plugin-protocol/src/executor.rs
@@ -36,7 +36,7 @@ pub struct ArtifactRef {
 
 /// Host-decided cache outcome. The executor honours this; it does
 /// not re-decide.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum CacheDecision {
     /// Boot from `tag`; skip running `cmd`.
diff --git a/crates/hm-plugin-protocol/src/hook.rs b/crates/hm-plugin-protocol/src/hook.rs
@@ -14,7 +14,7 @@ pub struct HookEvent {
     pub phase: HookPhase,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(rename_all = "snake_case")]
 pub enum HookPhase {
     /// May return [`HookOutcome::Abort`] to fail the build.
@@ -23,7 +23,7 @@ pub enum HookPhase {
     After,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum HookOutcome {
     /// Continue the build.
@@ -37,7 +37,7 @@ pub enum HookOutcome {
 ///
 /// The manifest declares *what* events the plugin wants, not the per-event
 /// payload. Kept in this file so plugin authors only import one module.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(rename_all = "snake_case")]
 pub enum HookEventKind {
     BuildStart,
diff --git a/crates/hm-plugin-protocol/src/host_abi.rs b/crates/hm-plugin-protocol/src/host_abi.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::executor::ArchiveId;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(rename_all = "snake_case")]
 pub enum Level {
     Trace,
@@ -19,7 +19,7 @@ pub enum Level {
     Error,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(rename_all = "snake_case")]
 pub enum KvScope {
     /// Per-plugin, persistent across builds. Stored in
diff --git a/crates/hm-plugin-protocol/src/ir.rs b/crates/hm-plugin-protocol/src/ir.rs
@@ -24,7 +24,7 @@ pub struct Pipeline {
     pub steps: Vec<Step>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum Step {
     Command(Box<CommandStep>),
diff --git a/crates/hm-plugin-protocol/src/manifest.rs b/crates/hm-plugin-protocol/src/manifest.rs
@@ -43,7 +43,7 @@ pub struct PluginManifest {
     pub allowed_hosts: Vec<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum Capability {
     Subcommand(SubcommandSpec),
diff --git a/crates/hm/Cargo.toml b/crates/hm/Cargo.toml
@@ -71,6 +71,7 @@ hm-plugin-protocol = { workspace = true }
 hm-util = { workspace = true }
 schemars = { workspace = true }
 semver = { workspace = true }
+smart-default = { workspace = true }
 once_cell = "1"
 hex = "0.4"
 
diff --git a/crates/hm/src/cli/plugin.rs b/crates/hm/src/cli/plugin.rs
@@ -50,10 +50,7 @@ pub async fn run(cmd: PluginCommand) -> Result<()> {
 
 #[allow(clippy::unused_async)]
 async fn list() -> Result<()> {
-    let reg = PluginRegistry::load(RegistryConfig {
-        auto_discover: true,
-        ..Default::default()
-    })?;
+    let reg = PluginRegistry::load(RegistryConfig::default())?;
     if reg.manifests().count() == 0 {
         println!("No plugins installed.");
         println!();
@@ -78,10 +75,7 @@ async fn list() -> Result<()> {
 
 #[allow(clippy::unused_async)]
 async fn info(name: &str) -> Result<()> {
-    let reg = PluginRegistry::load(RegistryConfig {
-        auto_discover: true,
-        ..Default::default()
-    })?;
+    let reg = PluginRegistry::load(RegistryConfig::default())?;
     let m = reg
         .manifests()
         .find(|m| m.name == name)
diff --git a/crates/hm/src/cli/version.rs b/crates/hm/src/cli/version.rs
@@ -10,10 +10,7 @@ use crate::plugin::{PluginRegistry, RegistryConfig};
 ///
 /// Returns an error if the plugin registry cannot be loaded.
 pub async fn run() -> Result<()> {
-    let reg = PluginRegistry::load(RegistryConfig {
-        auto_discover: true,
-        ..Default::default()
-    })?;
+    let reg = PluginRegistry::load(RegistryConfig::default())?;
     println!("hm {}", env!("CARGO_PKG_VERSION"));
     println!("plugin api version: {HM_PLUGIN_API_VERSION}");
     let count = reg.manifests().count();
diff --git a/crates/hm/src/orchestrator/docker_host_fns.rs b/crates/hm/src/orchestrator/docker_host_fns.rs
@@ -122,7 +122,7 @@ pub(crate) async fn exec_impl(args: DockerExecArgs) -> Result<i32> {
     // Emit StepLog events for each line written; the writer below
     // forwards bytes into the event bus tagged with the current
     // thread-local step_id set by the scheduler.
-    let mut writer = StepLogWriter::new();
+    let mut writer = StepLogWriter::default();
 
     // Future doing the exec; we race it against cancellation.
     let cancel = s.cancel.clone();
@@ -184,17 +184,13 @@ pub(crate) async fn stop_remove_impl(container_id: String) {
 
 /// Streams bytes from a Docker exec into per-line `StepLog` events on
 /// the event bus. Buffers partial lines until a `\n` arrives.
+#[derive(smart_default::SmartDefault)]
 struct StepLogWriter {
+    #[default(Vec::with_capacity(8192))]
     buf: Vec<u8>,
 }
 
 impl StepLogWriter {
-    fn new() -> Self {
-        Self {
-            buf: Vec::with_capacity(8192),
-        }
-    }
-
     fn flush_line(line: &[u8]) {
         let Some(state) = current() else { return };
         let Some(step_id) = crate::plugin::host_fns::current_step_id() else {
diff --git a/crates/hm/src/orchestrator/output_subscriber.rs b/crates/hm/src/orchestrator/output_subscriber.rs
@@ -29,7 +29,6 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use hm_plugin_protocol::BuildEvent;
 use tokio::sync::Mutex;
 use tokio::sync::broadcast::error::RecvError;
 
@@ -63,20 +62,20 @@ pub fn spawn(
                         let Some(&idx) = reg.output_formatter_index.get(&format_name) else {
                             // No plugin for this format; CLI parser
                             // should have caught this. Drain silently.
-                            if matches!(event, BuildEvent::BuildEnd { .. }) {
+                            if event.is_build_end() {
                                 return Ok(());
                             }
                             continue;
                         };
                         let Some(p) = reg.get(idx) else {
-                            if matches!(event, BuildEvent::BuildEnd { .. }) {
+                            if event.is_build_end() {
                                 return Ok(());
                             }
                             continue;
                         };
                         p
                     };
-                    let is_end = matches!(event, BuildEvent::BuildEnd { .. });
+                    let is_end = event.is_build_end();
                     // Log-and-continue on formatter failures: a broken
                     // output plugin shouldn't fail the build.
                     let _: Result<()> = plugin.call_capability("hm_output_on_event", &event).await;
diff --git a/crates/hm/src/plugin/registry.rs b/crates/hm/src/plugin/registry.rs
@@ -27,10 +27,11 @@ use super::manifest::{ManifestError, validate_standalone};
 use super::paths;
 use crate::error::HmError;
 
-#[derive(Debug, Default)]
+#[derive(Debug, smart_default::SmartDefault)]
 pub struct RegistryConfig {
     /// If `false`, skip discovery and only registers explicitly added
     /// plugins. Used by integration tests.
+    #[default = true]
     pub auto_discover: bool,
     /// Extra plugin paths to load (in addition to discovery). Used by
     /// tests to load fixture plugins.

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ pub(crate) fn resolve_image(`
`25`	`25`	`parent_snapshot: Option<&SnapshotRef>,`
`26`	`26`	`) -> String {`
`27`	`27`	`if let Some(tag) = hit_tag {`
`28`		`- return tag.0.clone();`
	`28`	`+ return tag.to_string();`
`29`	`29`	`}`
`30`	`30`	`if let Some(snap) = parent_snapshot {`
`31`		`- return snap.0.clone();`
	`31`	`+ return snap.to_string();`
`32`	`32`	`}`
`33`	`33`	`if let Some(image) = &step.image {`
`34`	`34`	`return image.clone();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ pub struct Pipeline {`
`24`	`24`	`pub steps: Vec<Step>,`
`25`	`25`	`}`
`26`	`26`
`27`		`-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]`
	`27`	`+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]`
`28`	`28`	`#[serde(tag = "type", rename_all = "snake_case")]`
`29`	`29`	`pub enum Step {`
`30`	`30`	`Command(Box<CommandStep>),`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ pub struct PluginManifest {`
`43`	`43`	`pub allowed_hosts: Vec<String>,`
`44`	`44`	`}`
`45`	`45`
`46`		`-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema)]`
	`46`	`+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, DeriveJsonSchema, derive_more::IsVariant)]`
`47`	`47`	`#[serde(tag = "kind", rename_all = "snake_case")]`
`48`	`48`	`pub enum Capability {`
`49`	`49`	`Subcommand(SubcommandSpec),`