From e0cbabeb035f48026ad7b09125bda177b63b3336 Mon Sep 17 00:00:00 2001 From: noshishiRust Date: Thu, 11 Apr 2024 08:29:21 +0900 Subject: [PATCH] update: validator crate --- Cargo.toml | 4 ++-- src/validator.rs | 4 ++-- src/validator/test.rs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4d9bb4c..178ff42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ features = ["full", "aide"] [dependencies] axum = { version = "0.7.3", default-features = false } garde = { version = "0.18.0", optional = true } -validator = { version = "0.17.0", optional = true } +validator = { version = "0.18.0", optional = true } validify = { version = "1.3.0", optional = true } [dependencies.axum-extra] @@ -57,7 +57,7 @@ axum = { version = "0.7.1", features = ["macros"] } tokio = { version = "1.34.0", features = ["full"] } reqwest = { version = "0.11.23", features = ["json", "multipart"] } serde = { version = "1.0.195", features = ["derive"] } -validator = { version = "0.17.0", features = ["derive"] } +validator = { version = "0.18.0", features = ["derive"] } garde = { version = "0.18.0", features = ["serde", "derive"] } serde_json = "1.0.108" serde_yaml = "0.9.27" diff --git a/src/validator.rs b/src/validator.rs index 4329535..db36639 100644 --- a/src/validator.rs +++ b/src/validator.rs @@ -252,8 +252,8 @@ pub mod tests { assert_eq!(&inner, v.deref()); assert_eq!(inner, v.into_inner()); - fn validate(v: &i32, args: &DataVA) -> Result<(), ValidationError> { - assert!(*v < args.a); + fn validate(v: i32, args: &DataVA) -> Result<(), ValidationError> { + assert!(v < args.a); Ok(()) } diff --git a/src/validator/test.rs b/src/validator/test.rs index 3c467f6..1bbd93b 100644 --- a/src/validator/test.rs +++ b/src/validator/test.rs @@ -47,10 +47,10 @@ pub struct ParametersEx { v1: String, } -fn validate_v0(v: &i32, args: &ParametersExValidationArguments) -> Result<(), ValidationError> { +fn validate_v0(v: i32, args: &ParametersExValidationArguments) -> Result<(), ValidationError> { args.inner .v0_range - .contains(v) + .contains(&v) .then_some(()) .ok_or_else(|| ValidationError::new("v0 is out of range")) } @@ -1208,11 +1208,11 @@ mod extra_typed_path { } fn validate_v0( - v: &i32, + v: i32, args: &TypedPathParamExValidationArguments, ) -> Result<(), ValidationError> { args.v0_range - .contains(v) + .contains(&v) .then_some(()) .ok_or_else(|| ValidationError::new("v0 is out of range")) }