refactor: move more types into the "types" module

Author: ctron

src/cmd/clean.rs

@@ -18,7 +18,7 @@ pub struct Clean {
     pub clean: ConfigOptsClean,
     /// Optionally clean any cached tools used by Trunk
     ///
-    /// These tools are cached in a platform dependent "projects" dir. Removing them will cause
+    /// These tools are cached in a platform-dependent "projects" dir. Removing them will cause
     /// them to be downloaded by Trunk next time they are needed.
     #[arg(short, long)]
     pub tools: bool,

src/config/models/mod.rs

@@ -1,15 +1,13 @@
+//! The configuration model
+//!
+//! This is what the user provides, and which gets converted into the runtime model.
+
 use crate::config::{RtcBuild, RtcClean, RtcServe, RtcWatch};
 use anyhow::{Context, Result};
-use axum::http::Uri;
-use serde::{Deserialize, Deserializer};
-use std::fmt::{Display, Formatter};
+use serde::Deserialize;
 use std::path::PathBuf;
-use std::str::FromStr;
 use std::sync::Arc;
 
-#[cfg(test)]
-mod test;
-
 mod build;
 mod clean;
 mod core;
@@ -30,17 +28,8 @@ pub use tools::*;
 pub use types::*;
 pub use watch::*;
 
-/// Deserialize a Uri from a string.
-fn deserialize_uri<'de, D, T>(data: D) -> std::result::Result<T, D::Error>
-where
-    D: Deserializer<'de>,
-    T: From<Uri>,
-{
-    let val = String::deserialize(data)?;
-    Uri::from_str(val.as_str())
-        .map(Into::into)
-        .map_err(|err| serde::de::Error::custom(err.to_string()))
-}
+#[cfg(test)]
+mod test;
 
 /// A model of all potential configuration options for the Trunk CLI system.
 #[derive(Clone, Debug, Default, Deserialize)]
@@ -461,36 +450,3 @@ impl ConfigOpts {
         greater
     }
 }
-
-/// Cross origin setting
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
-pub enum CrossOrigin {
-    #[default]
-    Anonymous,
-    UseCredentials,
-}
-
-impl CrossOrigin {
-    pub fn from_str(s: &str) -> Result<Self, CrossOriginParseError> {
-        Ok(match s {
-            "" | "anonymous" => CrossOrigin::Anonymous,
-            "use-credentials" => CrossOrigin::UseCredentials,
-            _ => return Err(CrossOriginParseError::InvalidValue),
-        })
-    }
-}
-
-impl Display for CrossOrigin {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Anonymous => write!(f, "anonymous"),
-            Self::UseCredentials => write!(f, "use-credentials"),
-        }
-    }
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum CrossOriginParseError {
-    #[error("invalid value")]
-    InvalidValue,
-}

src/config/models/types/cross_origin.rs

@@ -0,0 +1,34 @@
+use std::fmt::{Display, Formatter};
+
+/// Cross origin setting
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
+pub enum CrossOrigin {
+    #[default]
+    Anonymous,
+    UseCredentials,
+}
+
+impl CrossOrigin {
+    pub fn from_str(s: &str) -> anyhow::Result<Self, CrossOriginParseError> {
+        Ok(match s {
+            "" | "anonymous" => CrossOrigin::Anonymous,
+            "use-credentials" => CrossOrigin::UseCredentials,
+            _ => return Err(CrossOriginParseError::InvalidValue),
+        })
+    }
+}
+
+impl Display for CrossOrigin {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Anonymous => write!(f, "anonymous"),
+            Self::UseCredentials => write!(f, "use-credentials"),
+        }
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum CrossOriginParseError {
+    #[error("invalid value")]
+    InvalidValue,
+}

src/config/models/types/mod.rs

@@ -1,11 +1,15 @@
 mod address_family;
 mod base_url;
+mod cross_origin;
 mod duration;
 mod minify;
+mod serde;
 mod ws;
 
 pub use address_family::*;
 pub use base_url::*;
+pub use cross_origin::*;
 pub use duration::*;
 pub use minify::*;
+pub use serde::*;
 pub use ws::*;

src/config/models/types/serde.rs

@@ -0,0 +1,15 @@
+use axum::http::Uri;
+use serde::{Deserialize, Deserializer};
+use std::str::FromStr;
+
+/// Deserialize a Uri from a string.
+pub fn deserialize_uri<'de, D, T>(data: D) -> Result<T, D::Error>
+where
+    D: Deserializer<'de>,
+    T: From<Uri>,
+{
+    let val = String::deserialize(data)?;
+    Uri::from_str(val.as_str())
+        .map(Into::into)
+        .map_err(|err| serde::de::Error::custom(err.to_string()))
+}

src/config/rt/mod.rs

@@ -1,3 +1,7 @@
+//! The runtime configuration
+//!
+//! This is what the system actually uses.
+
 mod build;
 mod clean;
 mod core;