Polish.

milesj · milesj · commit dc20fcc99045 · 2025-08-02T14:11:33.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Added support for env prefixes at the field level when the field is also nested. This will
   override the env prefix defined on the nested container:
   `#[setting(nested, env_prefix = "OVERRIDE_")]`.
+- Updated `#[setting(extend)]` settings to support `Option` wrapped values.
 - Updated the methods of `PartialConfig` to all have a default implementation. This helps to greatly
   reduce the amount of macro generated code.
 - Improved the parse, handling, and validation of container and field attributes.
diff --git a/crates/core/src/container.rs b/crates/core/src/container.rs
@@ -293,7 +293,7 @@ impl Container {
                     panic!("Only 1 variant may be marked as default.");
                 }
 
-                match default_variants.get(0) {
+                match default_variants.first() {
                     Some(default_variant) => {
                         let res = default_variant.impl_partial_default_value();
 
diff --git a/crates/core/src/field.rs b/crates/core/src/field.rs
@@ -202,6 +202,10 @@ impl Field {
             return Some(self.get_name().to_uppercase());
         }
 
+        if self.args.parse_env.is_some() {
+            panic!("Cannot use `parse_env` without `env` or a parent `env_prefix`.");
+        }
+
         None
     }
 
@@ -297,15 +301,10 @@ impl Field {
             return self.value.impl_partial_env_value(&self.args, "");
         }
 
-        let Some(env_key) = self.get_env_var() else {
-            if self.args.parse_env.is_some() {
-                panic!("Cannot use `parse_env` without `env` or a parent `env_prefix`.");
-            }
-
-            return ImplResult::skipped();
-        };
-
-        self.value.impl_partial_env_value(&self.args, &env_key)
+        match self.get_env_var() {
+            Some(env_key) => self.value.impl_partial_env_value(&self.args, &env_key),
+            None => ImplResult::skipped(),
+        }
     }
 
     pub fn impl_partial_extends_from(&self) -> ImplResult {
diff --git a/crates/core/src/field_value.rs b/crates/core/src/field_value.rs
@@ -239,15 +239,13 @@ impl FieldValue {
     }
 
     #[cfg(not(feature = "extends"))]
-    pub fn impl_partial_extends_from(&self) -> ImplResult {
+    pub fn impl_partial_extends_from(&self, _field_name: &Ident) -> ImplResult {
         ImplResult::skipped()
     }
 
     #[cfg(feature = "extends")]
     pub fn impl_partial_extends_from(&self, field_name: &Ident) -> ImplResult {
-        let mut res = ImplResult::default();
-
-        res.value = match self.ty_string.as_str() {
+        let value = match self.ty_string.as_str() {
             "String" | "Option<String>" => {
                 quote! {
                     self.#field_name
@@ -277,7 +275,10 @@ impl FieldValue {
             }
         };
 
-        res
+        ImplResult {
+            value,
+            ..Default::default()
+        }
     }
 }
 
@@ -307,7 +308,6 @@ fn extract_type_information(
 
             if let Some(GenericArgument::Type(inner_ty)) = args.args.last() {
                 extract_type_information(inner_ty, layers, on_last);
-                return;
             }
         }
 
diff --git a/crates/core/src/utils.rs b/crates/core/src/utils.rs
@@ -27,7 +27,7 @@ pub fn is_inheritable_attribute(attr: &Attribute) -> bool {
 }
 
 pub fn to_type_string(ts: TokenStream) -> String {
-    format!("{}", ts)
+    format!("{ts}")
         .replace(" :: ", "::")
         .replace(" , ", ", ")
         .replace(" < ", "<")
diff --git a/crates/core/tests/snapshots/container_partial_test__container_partial__can_set.snap b/crates/core/tests/snapshots/container_partial_test__container_partial__can_set.snap
@@ -0,0 +1,54 @@
+---
+source: crates/core/tests/container_partial_test.rs
+expression: container.args.partial.as_ref().unwrap()
+---
+PartialArg {
+    meta: [
+        Meta(
+            Meta::List {
+                path: Path {
+                    leading_colon: None,
+                    segments: [
+                        PathSegment {
+                            ident: Ident(
+                                derive,
+                            ),
+                            arguments: PathArguments::None,
+                        },
+                    ],
+                },
+                delimiter: MacroDelimiter::Paren(
+                    Paren,
+                ),
+                tokens: TokenStream [
+                    Ident {
+                        sym: Other,
+                    },
+                ],
+            },
+        ),
+        Meta(
+            Meta::List {
+                path: Path {
+                    leading_colon: None,
+                    segments: [
+                        PathSegment {
+                            ident: Ident(
+                                serde,
+                            ),
+                            arguments: PathArguments::None,
+                        },
+                    ],
+                },
+                delimiter: MacroDelimiter::Paren(
+                    Paren,
+                ),
+                tokens: TokenStream [
+                    Ident {
+                        sym: another,
+                    },
+                ],
+            },
+        ),
+    ],
+}
diff --git a/crates/core/tests/snapshots/field_partial_test__field_partial__can_set.snap b/crates/core/tests/snapshots/field_partial_test__field_partial__can_set.snap
@@ -0,0 +1,54 @@
+---
+source: crates/core/tests/field_partial_test.rs
+expression: field.args.partial.as_ref().unwrap()
+---
+PartialArg {
+    meta: [
+        Meta(
+            Meta::List {
+                path: Path {
+                    leading_colon: None,
+                    segments: [
+                        PathSegment {
+                            ident: Ident(
+                                other,
+                            ),
+                            arguments: PathArguments::None,
+                        },
+                    ],
+                },
+                delimiter: MacroDelimiter::Paren(
+                    Paren,
+                ),
+                tokens: TokenStream [
+                    Ident {
+                        sym: attribute,
+                    },
+                ],
+            },
+        ),
+        Meta(
+            Meta::List {
+                path: Path {
+                    leading_colon: None,
+                    segments: [
+                        PathSegment {
+                            ident: Ident(
+                                and,
+                            ),
+                            arguments: PathArguments::None,
+                        },
+                    ],
+                },
+                delimiter: MacroDelimiter::Paren(
+                    Paren,
+                ),
+                tokens: TokenStream [
+                    Ident {
+                        sym: another,
+                    },
+                ],
+            },
+        ),
+    ],
+}
diff --git a/crates/core/tests/utils.rs b/crates/core/tests/utils.rs
@@ -1,6 +1,6 @@
 use proc_macro2::TokenStream;
-use schematic_core::container::Container;
-use schematic_core::field::Field;
+// use schematic_core::container::Container;
+// use schematic_core::field::Field;
 
 pub fn pretty(tokens: TokenStream) -> String {
     prettyplease::unparse(&syn::parse_file(&tokens.to_string()).unwrap())
diff --git a/crates/schematic/src/config/configs.rs b/crates/schematic/src/config/configs.rs
@@ -102,11 +102,10 @@ pub trait Config: Sized + Schematic {
     /// Return default values for the partial configuration.
     fn default_partial() -> Self::Partial {
         let context = <<Self as Config>::Partial as PartialConfig>::Context::default();
-        let defaults = <<Self as Config>::Partial as PartialConfig>::default_values(&context)
-            .unwrap()
-            .unwrap_or_default();
 
-        defaults
+        <<Self as Config>::Partial as PartialConfig>::default_values(&context)
+            .unwrap()
+            .unwrap_or_default()
     }
 
     /// Convert a partial configuration into a full configuration, with all values populated.

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ impl Container {`
`293`	`293`	`panic!("Only 1 variant may be marked as default.");`
`294`	`294`	`}`
`295`	`295`
`296`		`- match default_variants.get(0) {`
	`296`	`+ match default_variants.first() {`
`297`	`297`	`Some(default_variant) => {`
`298`	`298`	`let res = default_variant.impl_partial_default_value();`
`299`	`299`
Original file line number	Diff line number	Diff line change
`@@ -239,15 +239,13 @@ impl FieldValue {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`#[cfg(not(feature = "extends"))]`
`242`		`- pub fn impl_partial_extends_from(&self) -> ImplResult {`
	`242`	`+ pub fn impl_partial_extends_from(&self, _field_name: &Ident) -> ImplResult {`
`243`	`243`	`ImplResult::skipped()`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`#[cfg(feature = "extends")]`
`247`	`247`	`pub fn impl_partial_extends_from(&self, field_name: &Ident) -> ImplResult {`
`248`		`- let mut res = ImplResult::default();`
`249`		`-`
`250`		`- res.value = match self.ty_string.as_str() {`
	`248`	`+ let value = match self.ty_string.as_str() {`
`251`	`249`	`"String" \| "Option<String>" => {`
`252`	`250`	`quote! {`
`253`	`251`	`self.#field_name`
`@@ -277,7 +275,10 @@ impl FieldValue {`
`277`	`275`	`}`
`278`	`276`	`};`
`279`	`277`
`280`		`- res`
	`278`	`+ ImplResult {`
	`279`	`+ value,`
	`280`	`+ ..Default::default()`
	`281`	`+ }`
`281`	`282`	`}`
`282`	`283`	`}`
`283`	`284`
`@@ -307,7 +308,6 @@ fn extract_type_information(`
`307`	`308`
`308`	`309`	`if let Some(GenericArgument::Type(inner_ty)) = args.args.last() {`
`309`	`310`	`extract_type_information(inner_ty, layers, on_last);`
`310`		`- return;`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ pub fn is_inheritable_attribute(attr: &Attribute) -> bool {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`pub fn to_type_string(ts: TokenStream) -> String {`
`30`		`- format!("{}", ts)`
	`30`	`+ format!("{ts}")`
`31`	`31`	`.replace(" :: ", "::")`
`32`	`32`	`.replace(" , ", ", ")`
`33`	`33`	`.replace(" < ", "<")`