syn 2

miniconf_derive/Cargo.toml

@@ -13,6 +13,6 @@ categories = ["no-std", "config", "rust-patterns", "parsing"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.58", features = ["extra-traits"] }
-quote = "1.0.8"
-proc-macro2 = "1.0.24"
+syn = { version = "2.0", features = ["extra-traits"] }
+quote = "1.0"
+proc-macro2 = "1.0"

miniconf_derive/src/field.rs

@@ -1,4 +1,3 @@
-use super::attributes::{AttributeParser, MiniconfAttribute};
 use syn::{parse_quote, Generics};
 
 pub struct StructField {
@@ -8,14 +7,21 @@ pub struct StructField {
 
 impl StructField {
     pub fn new(field: syn::Field) -> Self {
-        let attributes: Vec<MiniconfAttribute> = field
-            .attrs
-            .iter()
-            .filter(|attr| attr.path.is_ident("miniconf"))
-            .map(|attr| AttributeParser::new(attr.tokens.clone()).parse())
-            .collect();
+        let mut deferred = false;
 
-        let deferred = attributes.iter().any(|x| *x == MiniconfAttribute::Defer);
+        for attr in field.attrs.iter() {
+            if attr.path().is_ident("miniconf") {
+                attr.parse_nested_meta(|meta| {
+                    if meta.path.is_ident("defer") {
+                        deferred = true;
+                        Ok(())
+                    } else {
+                        Err(meta.error(format!("unrecognized miniconf attribute {:?}", meta.path)))
+                    }
+                })
+                .unwrap();
+            }
+        }
 
         Self { deferred, field }
     }

miniconf_derive/src/lib.rs

@@ -2,7 +2,6 @@ use proc_macro::TokenStream;
 use quote::quote;
 use syn::{parse_macro_input, DeriveInput};
 
-mod attributes;
 mod field;
 
 use field::StructField;

src/lib.rs

@@ -16,10 +16,10 @@ pub use serde;
 
 // Re-exports
 #[cfg(feature = "json")]
-pub use serde_json_core;
-#[cfg(feature = "json")]
 pub use heapless;
 #[cfg(feature = "json")]
+pub use serde_json_core;
+#[cfg(feature = "json")]
 mod json;
 #[cfg(feature = "json")]
 pub use json::JsonCoreSlash;