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

Apply clippy fixes

Browse source
This commit is contained in:
Graham Esau 2023-02-26 19:59:17 +00:00
parent 39bae201eb
commit 824993ca76
6 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
schemars_derive/src/attr/schemars_to_serde.rs
View file

@ -46,14 +46,14 @@ pub fn process_serde_attrs(input: &mut syn::DeriveInput) -> Result<(), Vec<syn::
fn process_serde_variant_attrs<'a>(ctxt: &Ctxt, variants: impl Iterator<Item = &'a mut Variant>) {
for v in variants {
process_attrs(&ctxt, &mut v.attrs);
process_serde_field_attrs(&ctxt, v.fields.iter_mut());
process_attrs(ctxt, &mut v.attrs);
process_serde_field_attrs(ctxt, v.fields.iter_mut());
}
}
fn process_serde_field_attrs<'a>(ctxt: &Ctxt, fields: impl Iterator<Item = &'a mut Field>) {
for f in fields {
process_attrs(&ctxt, &mut f.attrs);
process_attrs(ctxt, &mut f.attrs);
}
}
@ -71,10 +71,10 @@ fn process_attrs(ctxt: &Ctxt, attrs: &mut Vec<Attribute>) {
// Copy appropriate #[schemars(...)] attributes to #[serde(...)] attributes
let (mut serde_meta, mut schemars_meta_names): (Vec<_>, HashSet<_>) = schemars_attrs
.iter()
.flat_map(|at| get_meta_items(&ctxt, at))
.flat_map(|at| get_meta_items(ctxt, at))
.flatten()
.filter_map(|meta| {
let keyword = get_meta_ident(&ctxt, &meta).ok()?;
let keyword = get_meta_ident(ctxt, &meta).ok()?;
if keyword.ends_with("with") || !SERDE_KEYWORDS.contains(&keyword.as_ref()) {
None
} else {
@ -91,10 +91,10 @@ fn process_attrs(ctxt: &Ctxt, attrs: &mut Vec<Attribute>) {
// Re-add #[serde(...)] attributes that weren't overridden by #[schemars(...)] attributes
for meta in serde_attrs
.into_iter()
.flat_map(|at| get_meta_items(&ctxt, &at))
.flat_map(|at| get_meta_items(ctxt, &at))
.flatten()
{
if let Ok(i) = get_meta_ident(&ctxt, &meta) {
if let Ok(i) = get_meta_ident(ctxt, &meta) {
if !schemars_meta_names.contains(&i)
&& SERDE_KEYWORDS.contains(&i.as_ref())
&& i != "bound"

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

@ -112,7 +112,7 @@ impl ValidationAttrs {
} else if self.length_equal.is_some() {
mutual_exclusive_error(&nv.path, "equal")
} else {
self.length_min = str_or_num_to_expr(&errors, "min", &nv.lit);
self.length_min = str_or_num_to_expr(errors, "min", &nv.lit);
}
}
NestedMeta::Meta(Meta::NameValue(nv)) if nv.path.is_ident("max") => {
@ -121,7 +121,7 @@ impl ValidationAttrs {
} else if self.length_equal.is_some() {
mutual_exclusive_error(&nv.path, "equal")
} else {
self.length_max = str_or_num_to_expr(&errors, "max", &nv.lit);
self.length_max = str_or_num_to_expr(errors, "max", &nv.lit);
}
}
NestedMeta::Meta(Meta::NameValue(nv)) if nv.path.is_ident("equal") => {
@ -133,14 +133,14 @@ impl ValidationAttrs {
mutual_exclusive_error(&nv.path, "max")
} else {
self.length_equal =
str_or_num_to_expr(&errors, "equal", &nv.lit);
str_or_num_to_expr(errors, "equal", &nv.lit);
}
}
meta => {
if !ignore_errors {
errors.error_spanned_by(
meta,
format!("unknown item in schemars length attribute"),
"unknown item in schemars length attribute".to_string(),
);
}
}
@ -155,21 +155,21 @@ impl ValidationAttrs {
if self.range_min.is_some() {
duplicate_error(&nv.path)
} else {
self.range_min = str_or_num_to_expr(&errors, "min", &nv.lit);
self.range_min = str_or_num_to_expr(errors, "min", &nv.lit);
}
}
NestedMeta::Meta(Meta::NameValue(nv)) if nv.path.is_ident("max") => {
if self.range_max.is_some() {
duplicate_error(&nv.path)
} else {
self.range_max = str_or_num_to_expr(&errors, "max", &nv.lit);
self.range_max = str_or_num_to_expr(errors, "max", &nv.lit);
}
}
meta => {
if !ignore_errors {
errors.error_spanned_by(
meta,
format!("unknown item in schemars range attribute"),
"unknown item in schemars range attribute".to_string(),
);
}
}
@ -247,7 +247,7 @@ impl ValidationAttrs {
if !ignore_errors {
errors.error_spanned_by(
meta,
format!("unknown item in schemars regex attribute"),
"unknown item in schemars regex attribute".to_string(),
);
}
}
@ -261,8 +261,8 @@ impl ValidationAttrs {
if path.is_ident("contains") =>
{
match (&self.contains, &self.regex) {
(Some(_), _) => duplicate_error(&path),
(None, Some(_)) => mutual_exclusive_error(&path, "regex"),
(Some(_), _) => duplicate_error(path),
(None, Some(_)) => mutual_exclusive_error(path, "regex"),
(None, None) => {
self.contains = get_lit_str(errors, attr_type, "contains", lit)
.map(|litstr| litstr.value())
@ -292,9 +292,7 @@ impl ValidationAttrs {
if !ignore_errors {
errors.error_spanned_by(
meta,
format!(
"unknown item in schemars contains attribute"
),
"unknown item in schemars contains attribute".to_string(),
);
}
}
@ -319,7 +317,7 @@ impl ValidationAttrs {
if let Some(length_min) = self
.length_min
.as_ref()
.or_else(|| self.length_equal.as_ref())
.or(self.length_equal.as_ref())
{
string_validation.push(quote! {
validation.min_length = Some(#length_min as u32);
@ -332,7 +330,7 @@ impl ValidationAttrs {
if let Some(length_max) = self
.length_max
.as_ref()
.or_else(|| self.length_equal.as_ref())
.or(self.length_equal.as_ref())
{
string_validation.push(quote! {
validation.max_length = Some(#length_max as u32);