diff options
| author | Vincent Prouillet | 2017-11-08 16:49:02 +0100 |
|---|---|---|
| committer | Vincent Prouillet | 2017-11-08 16:49:02 +0100 |
| commit | cfc3e49f293dff9aadb5b6374c0fc778c8e4ebf7 (patch) | |
| tree | 12346225fff91703e16ab4c0324cf9d18c4891cc /validator_derive/src/validation.rs | |
| parent | 176c58bc03a9cbcb03087e17ddd5b503ce77fc1f (diff) | |
| parent | 304ff212e20cd10e2f4bc99a54385db461a3a27d (diff) | |
| download | validator-cfc3e49f293dff9aadb5b6374c0fc778c8e4ebf7.tar.bz2 | |
Merge branch 'master' of https://github.com/valeriansaliou/validator into valeriansaliou-master
Diffstat (limited to 'validator_derive/src/validation.rs')
| -rw-r--r-- | validator_derive/src/validation.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/validator_derive/src/validation.rs b/validator_derive/src/validation.rs index a3350da..259db70 100644 --- a/validator_derive/src/validation.rs +++ b/validator_derive/src/validation.rs @@ -173,7 +173,7 @@ pub fn extract_range_validation(field: String, meta_items: &Vec<syn::NestedMetaI } } -/// Extract url/email field validation with a code or a message +/// Extract url/email/phone field validation with a code or a message pub fn extract_argless_validation(validator_name: String, field: String, meta_items: &Vec<syn::NestedMetaItem>) -> FieldValidation { let mut code = None; let mut message = None; @@ -213,7 +213,12 @@ pub fn extract_argless_validation(validator_name: String, field: String, meta_it } } - let validator = if validator_name == "email" { Validator::Email } else { Validator::Url }; + let validator = match validator_name.as_ref() { + "email" => Validator::Email, + "phone" => Validator::Phone, + _ => Validator::Url + }; + FieldValidation { message, code: code.unwrap_or_else(|| validator.code().to_string()), |
