diff options
| author | Sam Scott <sam@osohq.com> | 2023-01-07 13:59:50 -0600 |
|---|---|---|
| committer | Sam Scott <sam@osohq.com> | 2023-01-07 13:59:50 -0600 |
| commit | 951aabb61d3c01e68a81b4ddf2090cfcf945f732 (patch) | |
| tree | 31ab8b2af7958fb4c9f6608e328892de16b15682 | |
| parent | fbe9c6bcf2bf19dc46ecf60e255d52f4224359f2 (diff) | |
Fix axum examples.
| -rw-r--r-- | src/axum.rs | 5 | ||||
| -rw-r--r-- | tests/test_axum.rs | 30 | ||||
| -rw-r--r-- | tests/test_chrono.rs | 2 |
3 files changed, 16 insertions, 21 deletions
diff --git a/src/axum.rs b/src/axum.rs index 2638b3c..bba133c 100644 --- a/src/axum.rs +++ b/src/axum.rs @@ -43,7 +43,7 @@ use axum::{ /// } /// /// fn main() { -/// let app = Router::<Body>::new() +/// let app = Router::<(), Body>::new() /// .route("/users", get(filter_users)); /// } pub struct QsQuery<T>(pub T); @@ -72,6 +72,7 @@ impl<T: std::fmt::Debug> std::fmt::Debug for QsQuery<T> { impl<T, S> FromRequestParts<S> for QsQuery<T> where T: serde::de::DeserializeOwned, + S: Send + Sync, { type Rejection = QsQueryRejection; @@ -177,7 +178,7 @@ impl std::error::Error for QsQueryRejection { /// } /// /// fn main() { -/// let app = Router::<Body>::new() +/// let app = Router::<(), Body>::new() /// .route("/users", get(filter_users)) /// .layer(Extension(QsQueryConfig::new(5, false) /// .error_handler(|err| { diff --git a/tests/test_axum.rs b/tests/test_axum.rs index 0a07b19..16449b9 100644 --- a/tests/test_axum.rs +++ b/tests/test_axum.rs @@ -7,11 +7,7 @@ extern crate serde_derive; extern crate axum_framework as axum; extern crate serde_qs as qs; -use axum::{ - extract::{FromRequest, RequestParts}, - http::StatusCode, - response::IntoResponse, -}; +use axum::{extract::FromRequestParts, http::StatusCode, response::IntoResponse}; use qs::axum::{QsQuery, QsQueryConfig, QsQueryRejection}; use serde::de::Error; @@ -49,9 +45,9 @@ fn test_default_error_handler() { .uri("/test") .body(()) .unwrap(); - let mut req_parts = RequestParts::new(req); + let (mut req_parts, _) = req.into_parts(); - let e = QsQuery::<Query>::from_request(&mut req_parts) + let e = QsQuery::<Query>::from_request_parts(&mut req_parts, &()) .await .unwrap_err(); @@ -70,9 +66,8 @@ fn test_custom_error_handler() { })) .body(()) .unwrap(); - let mut req_parts = RequestParts::new(req); - - let query = QsQuery::<Query>::from_request(&mut req_parts).await; + let (mut req_parts, _) = req.into_parts(); + let query = QsQuery::<Query>::from_request_parts(&mut req_parts, &()).await; assert!(query.is_err()); assert_eq!( @@ -89,9 +84,8 @@ fn test_composite_querystring_extractor() { .uri("/test?foo=1&bars[]=0&bars[]=1&limit=100&offset=50&remaining=true") .body(()) .unwrap(); - let mut req_parts = RequestParts::new(req); - - let s = QsQuery::<Query>::from_request(&mut req_parts) + let (mut req_parts, _) = req.into_parts(); + let s = QsQuery::<Query>::from_request_parts(&mut req_parts, &()) .await .unwrap(); assert_eq!(s.foo, 1); @@ -109,9 +103,8 @@ fn test_default_qs_config() { .uri("/test?foo=1&bars%5B%5D=3&limit=100&offset=50&remaining=true") .body(()) .unwrap(); - let mut req_parts = RequestParts::new(req); - - let e = QsQuery::<Query>::from_request(&mut req_parts) + let (mut req_parts, _) = req.into_parts(); + let e = QsQuery::<Query>::from_request_parts(&mut req_parts, &()) .await .unwrap_err(); @@ -128,9 +121,8 @@ fn test_custom_qs_config() { .body(()) .unwrap(); - let mut req_parts = RequestParts::new(req); - - let s = QsQuery::<Query>::from_request(&mut req_parts) + let (mut req_parts, _) = req.into_parts(); + let s = QsQuery::<Query>::from_request_parts(&mut req_parts, &()) .await .unwrap(); assert_eq!(s.foo, 1); diff --git a/tests/test_chrono.rs b/tests/test_chrono.rs index 8267d56..bf43c8a 100644 --- a/tests/test_chrono.rs +++ b/tests/test_chrono.rs @@ -11,6 +11,7 @@ fn test_dates() { date_time: DateTime<FixedOffset>, } + #[allow(deprecated)] let params = Params { date_time: FixedOffset::east(9 * 3600) .ymd(2014, 11, 28) @@ -34,6 +35,7 @@ fn test_improperly_encoded_dates() { date_time: DateTime<FixedOffset>, } + #[allow(deprecated)] let _expected = Params { date_time: FixedOffset::east(9 * 3600) .ymd(2014, 11, 28) |