From 467298db852205329758f89d7c2f2639b61ad66a Mon Sep 17 00:00:00 2001
From: Vincent Prouillet
Date: Wed, 1 May 2019 22:03:17 +0200
Subject: Cargo fmt + edition 2018 for validator

---
 validator_derive/src/asserts.rs    | 10 +++++-----
 validator_derive/src/lib.rs        |  4 ++--
 validator_derive/src/quoting.rs    | 18 +++++++++---------
 validator_derive/src/validation.rs |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'validator_derive/src')

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
diff --git a/validator_derive/src/lib.rs b/validator_derive/src/lib.rs
index 0647a7d..f3796b4 100644
--- a/validator_derive/src/lib.rs
+++ b/validator_derive/src/lib.rs
@@ -420,8 +420,8 @@ fn find_original_field_name(meta_items: &Vec<&syn::NestedMeta>) -> Option<String
     let mut original_name = None;
 
     for meta_item in meta_items {
-        match *meta_item {
-            &syn::NestedMeta::Meta(ref item) => match *item {
+        match **meta_item {
+            syn::NestedMeta::Meta(ref item) => match *item {
                 syn::Meta::Word(_) => continue,
                 syn::Meta::NameValue(syn::MetaNameValue { ref ident, ref lit, .. }) => {
                     if ident == "rename" {
diff --git a/validator_derive/src/quoting.rs b/validator_derive/src/quoting.rs
index fa97623..b94962c 100644
--- a/validator_derive/src/quoting.rs
+++ b/validator_derive/src/quoting.rs
@@ -32,7 +32,7 @@ impl FieldQuoter {
             quote!(#ident)
         } else if COW_TYPE.is_match(&self._type.as_ref()) {
             quote!(self.#ident.as_ref())
-        } else if self._type.starts_with("&") || NUMBER_TYPES.contains(&self._type.as_ref()) {
+        } else if self._type.starts_with('&') || NUMBER_TYPES.contains(&self._type.as_ref()) {
             quote!(self.#ident)
         } else {
             quote!(&self.#ident)
@@ -92,14 +92,14 @@ impl FieldQuoter {
         let field_name = &self.name;
         if self._type.starts_with("Vec<") {
             return quote!(
-                if !::validator::ValidationErrors::has_error(&result, #field_name) {
-                    let results: Vec<_> = self.#field_ident.iter().map(|#field_ident| {
-                        let mut result = ::std::result::Result::Ok(());
-                        #tokens
-                        result
-                    }).collect();
-                    result = ::validator::ValidationErrors::merge_all(result, #field_name, results);
-                });
+            if !::validator::ValidationErrors::has_error(&result, #field_name) {
+                let results: Vec<_> = self.#field_ident.iter().map(|#field_ident| {
+                    let mut result = ::std::result::Result::Ok(());
+                    #tokens
+                    result
+                }).collect();
+                result = ::validator::ValidationErrors::merge_all(result, #field_name, results);
+            });
         }
 
         tokens
diff --git a/validator_derive/src/validation.rs b/validator_derive/src/validation.rs
index d9ad5a5..5f42d7b 100644
--- a/validator_derive/src/validation.rs
+++ b/validator_derive/src/validation.rs
@@ -134,7 +134,7 @@ pub fn extract_range_validation(
         }
     }
 
-    if !min.is_some() && !max.is_some() {
+    if min.is_none() && max.is_none() {
         error("Validator `range` requires at least 1 argument out of `min` and `max`");
     }
 
-- 
cgit v1.2.3