diff options
| author | Vincent Prouillet | 2019-07-13 16:42:14 +0200 |
|---|---|---|
| committer | GitHub | 2019-07-13 16:42:14 +0200 |
| commit | 87cf7cdac24dd0d4ea83a8a88640da95ae7ac93a (patch) | |
| tree | e11ce4ab7dc807ffb1464d13f329ccec4a6a62db /validator_derive/src/asserts.rs | |
| parent | 4b9fe3939b106c151bff11e490a41212559f9a4a (diff) | |
| parent | 0877c01f9a1bf5bcda3e3b235730f4d09982d8d2 (diff) | |
| download | validator-87cf7cdac24dd0d4ea83a8a88640da95ae7ac93a.tar.bz2 | |
Merge pull request #72 from Keats/next
Next version
Diffstat (limited to 'validator_derive/src/asserts.rs')
| -rw-r--r-- | validator_derive/src/asserts.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/validator_derive/src/asserts.rs b/validator_derive/src/asserts.rs index 1a8dfff..a5892a8 100644 --- a/validator_derive/src/asserts.rs +++ b/validator_derive/src/asserts.rs @@ -43,7 +43,7 @@ pub static NUMBER_TYPES: [&'static str; 36] = [ "Option<Option<f64>>", ]; -pub fn assert_string_type(name: &str, field_type: &String) { +pub fn assert_string_type(name: &str, field_type: &str) { if field_type != "String" && field_type != "&str" && !COW_TYPE.is_match(field_type) @@ -59,7 +59,7 @@ pub fn assert_string_type(name: &str, field_type: &String) { } } -pub fn assert_type_matches(field_name: String, field_type: &String, field_type2: Option<&String>) { +pub fn assert_type_matches(field_name: String, field_type: &str, field_type2: Option<&String>) { if let Some(t2) = field_type2 { if field_type != t2 { panic!("Invalid argument for `must_match` validator of field `{}`: types of field can't match", field_name); @@ -69,7 +69,7 @@ pub fn assert_type_matches(field_name: String, field_type: &String, field_type2: } } -pub fn assert_has_len(field_name: String, field_type: &String) { +pub fn assert_has_len(field_name: String, field_type: &str) { if field_type != "String" && !field_type.starts_with("Vec<") && !field_type.starts_with("Option<Vec<") @@ -89,8 +89,8 @@ pub fn assert_has_len(field_name: String, field_type: &String) { } } -pub fn assert_has_range(field_name: String, field_type: &String) { - if !NUMBER_TYPES.contains(&field_type.as_ref()) { +pub fn assert_has_range(field_name: String, field_type: &str) { + if !NUMBER_TYPES.contains(&field_type) { panic!( "Validator `range` can only be used on number types but found `{}` for field `{}`", field_type, field_name |
