chore: Release macroconf version 0.3.3

Cargo.toml

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

src/parser.rs

@@ -39,6 +39,7 @@ impl ConfigField {
 
     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 +51,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 +61,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 +153,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());

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"])]