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

Support inline regex

Browse source
This commit is contained in:
Graham Esau 2021-04-16 22:31:03 +01:00
parent 5f841f2e5c
commit c013052f59
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ use super::parse_lit_str;
use proc_macro2::TokenStream;
use syn::ExprLit;
use syn::NestedMeta;
use syn::{Expr, Lit, Meta, MetaNameValue, Path};
use syn::{Expr, Lit, Meta, MetaNameValue};
#[derive(Debug, Default)]
pub struct ValidationAttrs {
@ -11,7 +11,7 @@ pub struct ValidationAttrs {
pub length_equal: Option<Expr>,
pub range_min: Option<Expr>,
pub range_max: Option<Expr>,
pub regex: Option<Path>,
pub regex: Option<Expr>,
pub contains: Option<String>,
pub required: bool,
pub format: Option<&'static str>,
@ -84,7 +84,9 @@ impl ValidationAttrs {
path,
lit: Lit::Str(regex),
..
})) if path.is_ident("regex") => self.regex = parse_lit_str(regex).ok(),
})) if path.is_ident("regex") => {
self.regex = parse_lit_str::<syn::ExprPath>(regex).ok().map(Expr::Path)
}
NestedMeta::Meta(Meta::List(meta_list)) if meta_list.path.is_ident("regex") => {
self.regex = meta_list.nested.iter().find_map(|x| match x {
@ -92,7 +94,17 @@ impl ValidationAttrs {
path,
lit: Lit::Str(regex),
..
})) if path.is_ident("path") => parse_lit_str(regex).ok(),
})) if path.is_ident("path") => {
parse_lit_str::<syn::ExprPath>(regex).ok().map(Expr::Path)
}
NestedMeta::Meta(Meta::NameValue(MetaNameValue {
path,
lit: Lit::Str(regex),
..
})) if path.is_ident("pattern") => Some(Expr::Lit(syn::ExprLit {
attrs: Vec::new(),
lit: Lit::Str(regex.clone()),
})),
_ => None,
});
}