mirror of
https://github.com/tokio-rs/axum.git
synced 2026-09-08 00:00:24 +02:00
Fix accidental breaking change to FailedToDeserializeQueryString (#1233)
Fixes #1202 I'll update the changelogs, with notes about why 0.5.14 was yanked, in the release PR.
This commit is contained in:
@@ -67,7 +67,7 @@ where
|
|||||||
if req.method() == Method::GET {
|
if req.method() == Method::GET {
|
||||||
let query = req.uri().query().unwrap_or_default();
|
let query = req.uri().query().unwrap_or_default();
|
||||||
let value = serde_html_form::from_str(query)
|
let value = serde_html_form::from_str(query)
|
||||||
.map_err(FailedToDeserializeQueryString::__private_new)?;
|
.map_err(FailedToDeserializeQueryString::__private_new::<(), _>)?;
|
||||||
Ok(Form(value))
|
Ok(Form(value))
|
||||||
} else {
|
} else {
|
||||||
if !has_content_type(req, &mime::APPLICATION_WWW_FORM_URLENCODED) {
|
if !has_content_type(req, &mime::APPLICATION_WWW_FORM_URLENCODED) {
|
||||||
@@ -76,7 +76,7 @@ where
|
|||||||
|
|
||||||
let bytes = Bytes::from_request(req).await?;
|
let bytes = Bytes::from_request(req).await?;
|
||||||
let value = serde_html_form::from_bytes(&bytes)
|
let value = serde_html_form::from_bytes(&bytes)
|
||||||
.map_err(FailedToDeserializeQueryString::__private_new)?;
|
.map_err(FailedToDeserializeQueryString::__private_new::<(), _>)?;
|
||||||
|
|
||||||
Ok(Form(value))
|
Ok(Form(value))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ where
|
|||||||
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
|
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
|
||||||
let query = req.uri().query().unwrap_or_default();
|
let query = req.uri().query().unwrap_or_default();
|
||||||
let value = serde_html_form::from_str(query)
|
let value = serde_html_form::from_str(query)
|
||||||
.map_err(FailedToDeserializeQueryString::__private_new)?;
|
.map_err(FailedToDeserializeQueryString::__private_new::<(), _>)?;
|
||||||
Ok(Query(value))
|
Ok(Query(value))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ where
|
|||||||
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
|
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
|
||||||
let query = req.uri().query().unwrap_or_default();
|
let query = req.uri().query().unwrap_or_default();
|
||||||
let value = serde_urlencoded::from_str(query)
|
let value = serde_urlencoded::from_str(query)
|
||||||
.map_err(FailedToDeserializeQueryString::__private_new)?;
|
.map_err(FailedToDeserializeQueryString::__private_new::<(), _>)?;
|
||||||
Ok(Query(value))
|
Ok(Query(value))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ pub struct FailedToDeserializeQueryString {
|
|||||||
|
|
||||||
impl FailedToDeserializeQueryString {
|
impl FailedToDeserializeQueryString {
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
pub fn __private_new<E>(error: E) -> Self
|
pub fn __private_new<T, E>(error: E) -> Self
|
||||||
where
|
where
|
||||||
E: Into<BoxError>,
|
E: Into<BoxError>,
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -69,7 +69,7 @@ where
|
|||||||
if req.method() == Method::GET {
|
if req.method() == Method::GET {
|
||||||
let query = req.uri().query().unwrap_or_default();
|
let query = req.uri().query().unwrap_or_default();
|
||||||
let value = serde_urlencoded::from_str(query)
|
let value = serde_urlencoded::from_str(query)
|
||||||
.map_err(FailedToDeserializeQueryString::__private_new)?;
|
.map_err(FailedToDeserializeQueryString::__private_new::<(), _>)?;
|
||||||
Ok(Form(value))
|
Ok(Form(value))
|
||||||
} else {
|
} else {
|
||||||
if !has_content_type(req, &mime::APPLICATION_WWW_FORM_URLENCODED) {
|
if !has_content_type(req, &mime::APPLICATION_WWW_FORM_URLENCODED) {
|
||||||
@@ -78,7 +78,7 @@ where
|
|||||||
|
|
||||||
let bytes = Bytes::from_request(req).await?;
|
let bytes = Bytes::from_request(req).await?;
|
||||||
let value = serde_urlencoded::from_bytes(&bytes)
|
let value = serde_urlencoded::from_bytes(&bytes)
|
||||||
.map_err(FailedToDeserializeQueryString::__private_new)?;
|
.map_err(FailedToDeserializeQueryString::__private_new::<(), _>)?;
|
||||||
|
|
||||||
Ok(Form(value))
|
Ok(Form(value))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user