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

Respect serialize_with attr when serializing default

Browse source
This commit is contained in:
Graham Esau 2019-12-08 20:04:54 +00:00
parent 7e23e2ad7a
commit b748a90c3f
6 changed files with 74 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
schemars_derive/src/lib.rs
View file

@ -292,7 +292,6 @@ fn schema_for_struct(fields: &[Field], cattrs: &attr::Container) -> TokenStream
let name = field.attrs.name().deserialize_name();
let ty = field.ty;
// TODO respect serialize_with on field
let default = match field.attrs.default() {
SerdeDefault::None if set_container_default.is_some() => {
let field_ident = field
@ -305,7 +304,27 @@ fn schema_for_struct(fields: &[Field], cattrs: &attr::Container) -> TokenStream
SerdeDefault::None => None,
SerdeDefault::Default => Some(quote!(<#ty>::default())),
SerdeDefault::Path(path) => Some(quote!(#path())),
};
}
.map(|d| match field.attrs.serialize_with() {
Some(ser_with) => quote! {
{
struct _SchemarsDefaultSerialize<T>(T);
impl serde::Serialize for _SchemarsDefaultSerialize<#ty>
{
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer
{
#ser_with(&self.0, serializer)
}
}
_SchemarsDefaultSerialize(#d)
}
},
None => d,
});
if default.is_none() {
required.push(name.clone());

6
schemars_derive/src/metadata.rs
View file

@ -55,9 +55,9 @@ pub fn set_metadata_on_schema(schema_expr: TokenStream, metadata: &SchemaMetadat
if let Some(default) = &metadata.default {
setters.push(quote! {
metadata.default = match serde_json::json!(#default) {
serde_json::value::Value::Null => None,
d => Some(d),
metadata.default = match serde_json::value::to_value(#default) {
Ok(serde_json::value::Value::Null) | Err(_) => None,
Ok(d) => Some(d),
};
})
}