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

Handle required flattened Option fields

Browse source
This commit is contained in:
Graham Esau 2021-04-15 18:11:28 +01:00
parent b68132f17d
commit 1a2dafc1a5
5 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
schemars_derive/src/attr/validation.rs
View file

@ -120,17 +120,9 @@ impl ValidationAttrs {
self
}
pub fn validation_statements(&self, field_name: &str) -> TokenStream {
pub fn validation_statements(&self, field_name: &str) -> Option<TokenStream> {
// Assume that the result will be interpolated in a context with the local variable
// `schema_object` - the SchemaObject for the struct that contains this field.
let mut statements = Vec::new();
// if self.required {
// statements.push(quote! {
// schema_object.object().required.insert(#field_name.to_owned());
// });
// }
let mut array_validation = Vec::new();
let mut number_validation = Vec::new();
let mut object_validation = Vec::new();
@ -210,7 +202,7 @@ impl ValidationAttrs {
|| string_validation.is_some()
|| format.is_some()
{
statements.push(quote! {
Some(quote! {
if let Some(schemars::schema::Schema::Object(prop_schema_object)) = schema_object
.object
.as_mut()
@ -222,10 +214,10 @@ impl ValidationAttrs {
#string_validation
#format
}
});
})
} else {
None
}
statements.into_iter().collect()
}
}