OMGeeky/confique
1
0
Fork 0
mirror of https://github.com/OMGeeky/confique.git synced 2026-01-17 00:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Slightly improve derive error message for nested fields not impl Config

Browse Source
This commit is contained in:
Lukas Kalbertodt
2021-10-26 16:18:29 +02:00
parent 3c5b72220a
commit 608b978341
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
macro/src/gen.rs
View File

@@ -1,6 +1,6 @@
use proc_macro2::{Span, TokenStream};
use quote::{ToTokens, format_ident, quote, quote_spanned};
use syn::Ident;
use syn::{Ident, spanned::Spanned};
use crate::ir::{self, Expr, FieldKind, LeafKind};
@@ -95,9 +95,13 @@ fn gen_partial_mod(input: &ir::Input) -> TokenStream {
#inner_vis #name: Option<#inner_ty>
}
},
FieldKind::Nested { ty } => quote! {
#[serde(default = "confique::Partial::empty")]
#inner_vis #name: <#ty as confique::Config>::Partial
FieldKind::Nested { ty } => {
let ty_span = ty.span();
let field_ty = quote_spanned! {ty_span=> <#ty as confique::Config>::Partial };
quote! {
#[serde(default = "confique::Partial::empty")]
#inner_vis #name: #field_ty
}
},
}
});
@@ -141,7 +145,7 @@ fn gen_partial_mod(input: &ir::Input) -> TokenStream {
}
});
let fallbacks= input.fields.iter().map(|f| {
let fallbacks = input.fields.iter().map(|f| {
let name = &f.name;
if f.is_leaf() {
quote! { self.#name.or(fallback.#name) }
@@ -173,6 +177,13 @@ fn gen_partial_mod(input: &ir::Input) -> TokenStream {
}
});
let nested_bounds = input.fields.iter().filter_map(|f| {
match &f.kind {
FieldKind::Nested { ty } => Some(quote! { #ty: confique::Config }),
FieldKind::Leaf { .. } => None,
}
});
let struct_visibility = inner_visibility(&input.visibility, Span::call_site());
quote! {
#visibility mod #mod_name {
@@ -184,7 +195,7 @@ fn gen_partial_mod(input: &ir::Input) -> TokenStream {
}
#[automatically_derived]
impl confique::Partial for #struct_name {
impl confique::Partial for #struct_name where #( #nested_bounds, )* {
fn empty() -> Self {
Self {
#( #field_names: #empty_values, )*