chore: Release macroconf version 0.3.4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "macroconf"
-version = "0.3.0"
+version = "0.3.4"
 edition = "2021"
 description = "macro for creating configurations using miniconf"
 license = "MIT OR Apache-2.0"

src/parser.rs

@@ -5,7 +5,7 @@ use std::convert::identity;
 use convert_case::{Case, Casing};
 use darling::{
     ast::{self, Data},
-    util::{Override, PathList},
+    util::{Flag, Override, PathList},
     Error, FromDeriveInput, FromField, FromMeta,
 };
 use proc_macro2::{Span, TokenStream};
@@ -26,6 +26,7 @@ pub struct ConfigField {
     typ: Option<syn::Type>,
     get: Option<syn::Path>,
     set: Option<syn::Path>,
+    no_serde: Flag,
     #[darling(skip)]
     description: Option<syn::Expr>,
     #[darling(skip)]
@@ -34,11 +35,12 @@ pub struct ConfigField {
 
 impl ConfigField {
     pub(crate) fn needs_newtype(&self) -> bool {
-        self.helper_keys().len() > 1
+        self.helper_keys().len() > 1 || self.typ.is_some()
     }
 
     pub(crate) fn helper(&self, attrs: &[syn::Attribute]) -> (Option<TokenStream>, syn::Type) {
         if self.needs_newtype() {
+            let default = self.helper_default();
             let derives = attrs
                 .iter()
                 .find(|attr| attr.path().is_ident("derive"))
@@ -50,6 +52,7 @@ impl ConfigField {
                             derive.contains("Tree")
                                 || derive.contains("Serialize")
                                 || derive.contains("Deserialize")
+                                || (default.is_some() && derive.contains("Default"))
                         }) == Some(false)
                     });
                     quote! {#[derive(#(#derives,)*)]}
@@ -59,7 +62,6 @@ impl ConfigField {
             let ty = &self.ty;
 
             let new = self.helper_new();
-            let default = self.helper_default();
             let serde = self.helper_serde();
             let tree = self.helper_tree();
 
@@ -152,6 +154,9 @@ impl ConfigField {
     }
 
     pub(crate) fn helper_default(&self) -> Option<TokenStream> {
+        if self.typ.is_some() {
+            return None;
+        }
         self.default.as_ref().map(|default| {
             let ident = self.helper_ident();
             let default_default = parse_quote!(::core::default::Default::default());
@@ -166,7 +171,10 @@ impl ConfigField {
         })
     }
 
-    pub(crate) fn helper_serde(&self) -> TokenStream {
+    pub(crate) fn helper_serde(&self) -> Option<TokenStream> {
+        if self.no_serde.is_present() {
+            return None;
+        }
         let ident = self.helper_ident();
         let conversion = if self.has_custom_limits() {
             quote! {
@@ -180,7 +188,7 @@ impl ConfigField {
             }
         };
         let ty = &self.ty;
-        quote! {
+        Some(quote! {
             impl ::serde::Serialize for #ident {
                 fn serialize<S>(&self, serializer: S) -> ::core::result::Result::<S::Ok, S::Error>
                 where
@@ -200,7 +208,7 @@ impl ConfigField {
                     #conversion
                 }
             }
-        }
+        })
     }
 
     pub(crate) fn helper_tree(&self) -> TokenStream {
@@ -346,6 +354,13 @@ impl ConfigField {
             .typ
             .as_ref()
             .map_or_else(|| quote!(Self), |typ| quote!(#typ));
+        let match_range = if num_keys > 1 {
+            Some(
+                quote!(1..=#num_keys => ::core::result::Result::Err(::miniconf::Traversal::Access(0, "Cannot write limits").into()),),
+            )
+        } else {
+            None
+        };
         quote! {
             impl<'de> ::miniconf::TreeDeserialize<'de, 1> for #ident {
                 fn deserialize_by_key<K, D>(
@@ -370,8 +385,7 @@ impl ConfigField {
                             #set(<#typ as ::serde::Deserialize>::deserialize(de).map_err(|err| ::miniconf::Error::Inner(0, err))?)?;
                             Ok(0)
                         }
-                        ,
+                        #match_range
-                        1..=#num_keys => ::core::result::Result::Err(::miniconf::Traversal::Access(0, "Cannot write limits").into()),
                         _ => unreachable!(),
                     }
                 }
@@ -387,6 +401,13 @@ impl ConfigField {
         } else {
             quote!(::core::result::Result::Ok(&mut *self))
         };
+        let match_range = if num_keys > 1 {
+            Some(
+                quote!(1..#num_keys => ::core::result::Result::Err(::miniconf::Traversal::Access(1, "cannot return reference to local variable")),),
+            )
+        } else {
+            None
+        };
         quote! {
             impl ::miniconf::TreeAny<1> for #ident {
                 fn ref_any_by_key<K>(&self, mut keys: K) -> ::core::result::Result<&dyn ::core::any::Any, ::miniconf::Traversal>
@@ -402,7 +423,7 @@ impl ConfigField {
                     }
                     match index {
                         0 => ::core::result::Result::Ok(&*self),
-                        1..#num_keys => ::core::result::Result::Err(::miniconf::Traversal::Access(1, "cannot return reference to local variable")),
+                        #match_range
                         _ => unreachable!(),
                     }
                 }
@@ -420,7 +441,7 @@ impl ConfigField {
                     }
                     match index {
                         0 => #ref_mut,
-                        1..#num_keys => ::core::result::Result::Err(::miniconf::Traversal::Access(1, "cannot return reference to local variable")),
+                        #match_range
                         _ => unreachable!(),
                     }
                 }

tests/get_set.rs

@@ -28,6 +28,17 @@ struct Config {
     field: Cell<i32>,
 }
 
+#[config]
+struct WithSetterAndDefault {
+    #[config(
+        default = "42",
+        typ = "i32",
+        get = "Cell::get",
+        set = "set_cell::<{i32::MIN}, {i32::MAX}>"
+    )]
+    field: Cell<i32>,
+}
+
 #[test]
 fn get() {
     let mut buffer = [0u8; 32];

tests/simple.rs

@@ -31,6 +31,14 @@ struct Config {
     sub_config: SubConfig,
 }
 
+/// Config with default derive and default field
+#[config]
+#[derive(Default)]
+struct _DefaultConfig {
+    #[config(default)]
+    field: i32,
+}
+
 #[rstest]
 #[case(0, ["skipped"])]
 #[case(1, ["min"])]