Restore behaviour of custom fns

Fixes #310
Keats · Apr 5, 2024 · 59a97b3 · 59a97b3
1 parent 96f7581
commit 59a97b3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/validator_derive/src/lib.rs b/validator_derive/src/lib.rs
@@ -182,11 +182,14 @@ impl ToTokens for ValidateField {
         // Custom validation
         let mut custom = quote!();
         for c in &self.custom {
-            let tokens = custom_tokens(c.clone(), &field_name, &field_name_str);
+            let tokens = custom_tokens(c.clone(), &actual_field, &field_name_str);
             custom = quote!(
               #tokens
             );
         }
+        if !self.custom.is_empty() {
+            custom = wrapper_closure(custom);
+        }
 
         let nested = if let Some(n) = self.nested {
             if n {

diff --git a/validator_derive/src/tokens/custom.rs b/validator_derive/src/tokens/custom.rs
@@ -1,24 +1,23 @@
 use quote::quote;
-use syn::Ident;
 
 use crate::types::Custom;
 use crate::utils::quote_message;
 
 pub fn custom_tokens(
     custom: Custom,
-    field_name: &Ident,
+    field_name: &proc_macro2::TokenStream,
     field_name_str: &str,
 ) -> proc_macro2::TokenStream {
     let fn_call = custom.function.unwrap();
 
     let args = if let Some(arg) = custom.use_context {
         if arg {
-            quote!(&self.#field_name, args)
+            quote!(&#field_name, args)
         } else {
-            quote!(&self.#field_name)
+            quote!(&#field_name)
         }
     } else {
-        quote!(&self.#field_name)
+        quote!(&#field_name)
     };
 
     let message = quote_message(custom.message);
@@ -37,7 +36,7 @@ pub fn custom_tokens(
             ::std::result::Result::Err(mut err) => {
                 #code
                 #message
-                err.add_param(::std::borrow::Cow::from("value"), &self.#field_name);
+                err.add_param(::std::borrow::Cow::from("value"), &#field_name);
                 errors.add(#field_name_str, err);
             }
         }

diff --git a/validator_derive_tests/tests/complex.rs b/validator_derive_tests/tests/complex.rs
@@ -97,7 +97,7 @@ fn test_can_validate_option_fields_with_lifetime() {
         custom: Option<&'a str>,
     }
 
-    fn check_str(_: &Option<&str>) -> Result<(), ValidationError> {
+    fn check_str(_: &&str) -> Result<(), ValidationError> {
         Ok(())
     }
 
@@ -145,7 +145,7 @@ fn test_can_validate_option_fields_without_lifetime() {
         custom: Option<String>,
     }
 
-    fn check_str(_: &Option<String>) -> Result<(), ValidationError> {
+    fn check_str(_: &String) -> Result<(), ValidationError> {
         Ok(())
     }
 

diff --git a/validator_derive_tests/tests/run-pass/optional_field.rs b/validator_derive_tests/tests/run-pass/optional_field.rs
@@ -3,7 +3,7 @@ use validator::{Validate, ValidationError};
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct CountryCode(pub String);
 
-fn validate_country_code(_country_code: &Option<CountryCode>) -> Result<(), ValidationError> {
+fn validate_country_code(_country_code: &CountryCode) -> Result<(), ValidationError> {
     if false {
         Ok(())
     } else {