From f8c1daeeb05e80903f9d6ddda5646de9047c76b9 Mon Sep 17 00:00:00 2001 From: gengteng Date: Fri, 12 Jul 2024 20:31:17 +0800 Subject: [PATCH] feat: update garde to 0.20.0 --- Cargo.toml | 12 ++++++------ README.md | 4 ++-- src/cbor.rs | 2 +- src/extra.rs | 6 +++--- src/extra/form.rs | 2 +- src/extra/protobuf.rs | 2 +- src/extra/query.rs | 2 +- src/extra/typed_path.rs | 2 +- src/form.rs | 2 +- src/garde.rs | 4 ++-- src/garde/test.rs | 2 +- src/json.rs | 2 +- src/msgpack.rs | 4 ++-- src/path.rs | 2 +- src/query.rs | 2 +- src/sonic.rs | 2 +- src/toml.rs | 2 +- src/typed_header.rs | 2 +- src/typed_multipart.rs | 4 ++-- src/xml.rs | 2 +- src/yaml.rs | 2 +- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2f21398..d476db0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "axum-valid" -version = "0.18.0" +version = "0.19.0" description = "Provides validation extractors for your Axum application, allowing you to validate data using validator, garde, validify or all of them." authors = ["GengTeng "] license = "MIT" @@ -26,17 +26,17 @@ features = ["full", "aide"] [dependencies] axum = { version = "0.7.3", default-features = false } -garde = { version = "0.18.0", optional = true } +garde = { version = "0.20.0", optional = true } validator = { version = "0.18.1", optional = true } validify = { version = "1.4.0", optional = true } [dependencies.axum-extra] -version = "0.9.0" +version = "0.9.3" default-features = false optional = true [dependencies.axum-serde] -version = "0.4.1" +version = "0.5.0" optional = true [dependencies.axum_typed_multipart] @@ -58,10 +58,10 @@ tokio = { version = "1.34.0", features = ["full"] } reqwest = { version = "0.12.3", features = ["json", "multipart"] } serde = { version = "1.0.195", features = ["derive"] } validator = { version = "0.18.0", features = ["derive"] } -garde = { version = "0.18.0", features = ["serde", "derive"] } +garde = { version = "0.20.0", features = ["serde", "derive"] } serde_json = "1.0.108" serde_yaml = "0.9.27" -quick-xml = { version = "0.31.0", features = ["serialize"] } +quick-xml = { version = "0.33.0", features = ["serialize"] } ciborium = { version = "0.2.2" } toml = "0.8.8" mime = "0.3.17" diff --git a/README.md b/README.md index e0399c5..c66cb8c 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ ## 📑 Overview -**axum-valid** is a library that provides data validation extractors for the Axum web framework. It integrates * -*validator**, **garde** and **validify**, three popular validation crates in the Rust ecosystem, to offer convenient +**axum-valid** is a library that provides data validation extractors for the Axum web framework. It integrates +**validator**, **garde** and **validify**, three popular validation crates in the Rust ecosystem, to offer convenient validation and data handling extractors for Axum applications. ## 🚀 Basic usage diff --git a/src/cbor.rs b/src/cbor.rs index 61f2132..1bcb5c4 100644 --- a/src/cbor.rs +++ b/src/cbor.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Cbor(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/extra.rs b/src/extra.rs index e2efe19..455c5f7 100644 --- a/src/extra.rs +++ b/src/extra.rs @@ -89,7 +89,7 @@ //! } //! //! async fn handler(Garde(Cached(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! //! #[derive(Validate, Clone)] @@ -223,7 +223,7 @@ //! WithRejection, //! >, //! ) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! //! #[derive(Validate)] @@ -380,7 +380,7 @@ //! WithRejectionGardeRejection, //! >, //! ) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! //! #[derive(Validate)] diff --git a/src/extra/form.rs b/src/extra/form.rs index 197ce17..e7107e7 100644 --- a/src/extra/form.rs +++ b/src/extra/form.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Form(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/extra/protobuf.rs b/src/extra/protobuf.rs index c48f816..64e09ac 100644 --- a/src/extra/protobuf.rs +++ b/src/extra/protobuf.rs @@ -56,7 +56,7 @@ //! } //! //! async fn handler(Garde(Protobuf(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/extra/query.rs b/src/extra/query.rs index cce0939..f1716b4 100644 --- a/src/extra/query.rs +++ b/src/extra/query.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Query(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/extra/typed_path.rs b/src/extra/typed_path.rs index e210359..6ebe3f2 100644 --- a/src/extra/typed_path.rs +++ b/src/extra/typed_path.rs @@ -59,7 +59,7 @@ //! } //! //! async fn handler(parameter: Garde) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! //! #[derive(TypedPath, Deserialize, Validate)] diff --git a/src/form.rs b/src/form.rs index 9aba12f..20e627f 100644 --- a/src/form.rs +++ b/src/form.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Form(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/garde.rs b/src/garde.rs index 8b4c903..d20c315 100644 --- a/src/garde.rs +++ b/src/garde.rs @@ -93,7 +93,7 @@ where .await .map_err(GardeRejection::Inner)?; - inner.get_validate().validate(&context)?; + inner.get_validate().validate_with(&context)?; Ok(Garde(inner)) } } @@ -113,7 +113,7 @@ where let inner = Extractor::from_request_parts(parts, state) .await .map_err(GardeRejection::Inner)?; - inner.get_validate().validate(&context)?; + inner.get_validate().validate_with(&context)?; Ok(Garde(inner)) } } diff --git a/src/garde/test.rs b/src/garde/test.rs index c7540bb..48ce0b2 100644 --- a/src/garde/test.rs +++ b/src/garde/test.rs @@ -541,7 +541,7 @@ fn validate_again(validate: V, context: V::Context) -> StatusCode { // it should have returned `400 BAD REQUEST` if the `parameters` were invalid, // Let's validate them again to check if the `Garde` extractor works well. // If it works properly, this function will never return `500 INTERNAL SERVER ERROR` - match validate.validate(&context) { + match validate.validate_with(&context) { Ok(_) => StatusCode::OK, Err(_) => StatusCode::INTERNAL_SERVER_ERROR, } diff --git a/src/json.rs b/src/json.rs index 9a01a3f..bbc1a2a 100644 --- a/src/json.rs +++ b/src/json.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Json(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/msgpack.rs b/src/msgpack.rs index eacb6ec..d52322a 100644 --- a/src/msgpack.rs +++ b/src/msgpack.rs @@ -59,11 +59,11 @@ //! } //! //! async fn handler(Garde(MsgPack(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! //! async fn raw_handler(Garde(MsgPackRaw(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! #[derive(Validate, Deserialize)] //! pub struct Parameter { diff --git a/src/path.rs b/src/path.rs index 181b7ff..0860f53 100644 --- a/src/path.rs +++ b/src/path.rs @@ -50,7 +50,7 @@ //! } //! //! async fn handler(Garde(Path(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/query.rs b/src/query.rs index 1c1b115..5b9a42a 100644 --- a/src/query.rs +++ b/src/query.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Query(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/sonic.rs b/src/sonic.rs index a0d7720..c884d25 100644 --- a/src/sonic.rs +++ b/src/sonic.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Sonic(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/toml.rs b/src/toml.rs index b53cb4b..9ba3eae 100644 --- a/src/toml.rs +++ b/src/toml.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Toml(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/typed_header.rs b/src/typed_header.rs index ea279c5..8ffb07e 100644 --- a/src/typed_header.rs +++ b/src/typed_header.rs @@ -74,7 +74,7 @@ //! } //! //! async fn handler(Garde(TypedHeader(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! //! #[derive(Validate)] diff --git a/src/typed_multipart.rs b/src/typed_multipart.rs index 231752f..fa22b0a 100644 --- a/src/typed_multipart.rs +++ b/src/typed_multipart.rs @@ -65,7 +65,7 @@ //! } //! //! async fn handler(Garde(TypedMultipart(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } @@ -75,7 +75,7 @@ //! data: parameter, .. //! }): Garde>, //! ) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! } //! //! #[derive(TryFromMultipart, Validate)] diff --git a/src/xml.rs b/src/xml.rs index b28c08c..28b6c1d 100644 --- a/src/xml.rs +++ b/src/xml.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Xml(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! } diff --git a/src/yaml.rs b/src/yaml.rs index a0a9a6a..486c2b8 100644 --- a/src/yaml.rs +++ b/src/yaml.rs @@ -54,7 +54,7 @@ //! } //! //! async fn handler(Garde(Yaml(parameter)): Garde>) { -//! assert!(parameter.validate(&()).is_ok()); +//! assert!(parameter.validate_with(&()).is_ok()); //! // Support automatic dereferencing //! println!("v0 = {}, v1 = {}", parameter.v0, parameter.v1); //! }