VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not ignore all serde attributes if there are also schemars attributes

Browse source
This commit is contained in:
Graham Esau 2019-09-08 22:46:18 +01:00
parent 0304fefb61
commit af1fa5fe9e
4 changed files with 105 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
schemars_derive/src/lib.rs
View file

@ -19,7 +19,9 @@ pub fn derive_json_schema(input: proc_macro::TokenStream) -> proc_macro::TokenSt
let mut input = parse_macro_input!(input as DeriveInput);
preprocess::add_trait_bounds(&mut input.generics);
preprocess::rename_schemars_attrs(&mut input);
if let Err(e) = preprocess::process_serde_attrs(&mut input) {
return e.into();
}
let ctxt = Ctxt::new();
let cont = Container::from_ast(&ctxt, &input, Derive::Deserialize);
@ -237,13 +239,13 @@ fn schema_for_struct(fields: &[Field], cattrs: &attr::Container) -> TokenStream
let (nested, flat): (Vec<_>, Vec<_>) = fields.iter().partition(|f| !f.attrs.flatten());
let container_has_default = has_default(cattrs.default());
let mut required = Vec::new();
let recurse = nested.iter().map(|f| {
let name = f.attrs.name().deserialize_name();
if !container_has_default && !has_default(f.attrs.default()) {
let recurse = nested.iter().map(|field| {
let name = field.attrs.name().deserialize_name();
if !container_has_default && !has_default(field.attrs.default()) {
required.push(name.clone());
}
let ty = f.ty;
quote_spanned! {f.original.span()=>
let ty = field.ty;
quote_spanned! {field.original.span()=>
props.insert(#name.to_owned(), gen.subschema_for::<#ty>()?);
}
});