itsscb/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2025-09-27 04:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run into_parts eagerly in more places

Browse Source
This commit is contained in:
Jonas Platte 2025-03-27 17:03:39 +01:00 committed by Jonas Platte
parent ee4727b865
commit 2f2bb99550
8 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
axum-core/src/extract/mod.rs
View File

@ -101,9 +101,12 @@ where
{
type Rejection = <Self as FromRequestParts<S>>::Rejection;
async fn from_request(req: Request, state: &S) -> Result<Self, Self::Rejection> {
fn from_request(
req: Request,
state: &S,
) -> impl Future<Output = Result<Self, Self::Rejection>> {
let (mut parts, _) = req.into_parts();
Self::from_request_parts(&mut parts, state).await
async move { Self::from_request_parts(&mut parts, state).await }
}
}

18
axum-core/src/extract/tuple.rs
View File

@ -1,7 +1,7 @@
use super::{FromRequest, FromRequestParts, Request};
use crate::response::{IntoResponse, Response};
use http::request::Parts;
use std::convert::Infallible;
use std::{convert::Infallible, future::Future};
impl<S> FromRequestParts<S> for ()
where
@ -52,18 +52,20 @@ macro_rules! impl_from_request {
{
type Rejection = Response;
async fn from_request(req: Request, state: &S) -> Result<Self, Self::Rejection> {
fn from_request(req: Request, state: &S) -> impl Future<Output = Result<Self, Self::Rejection>> {
let (mut parts, body) = req.into_parts();
$(
let $ty = $ty::from_request_parts(&mut parts, state).await.map_err(|err| err.into_response())?;
)*
async move {
$(
let $ty = $ty::from_request_parts(&mut parts, state).await.map_err(|err| err.into_response())?;
)*
let req = Request::from_parts(parts, body);
let req = Request::from_parts(parts, body);
let $last = $last::from_request(req, state).await.map_err(|err| err.into_response())?;
let $last = $last::from_request(req, state).await.map_err(|err| err.into_response())?;
Ok(($($ty,)* $last,))
Ok(($($ty,)* $last,))
}
}
}
};

4
axum-extra/src/handler/or.rs
View File

@ -66,9 +66,9 @@ where
type Future = BoxFuture<'static, Response>;
fn call(self, req: Request, state: S) -> Self::Future {
Box::pin(async move {
let (mut parts, body) = req.into_parts();
let (mut parts, body) = req.into_parts();
Box::pin(async move {
if let Ok(lt) = Lt::from_request_parts(&mut parts, &state).await {
return self.lhs.call(lt, state).await;
}

4
axum/src/error_handling/mod.rs
View File

@ -180,9 +180,9 @@ macro_rules! impl_service {
let clone = self.inner.clone();
let inner = std::mem::replace(&mut self.inner, clone);
let future = Box::pin(async move {
let (mut parts, body) = req.into_parts();
let (mut parts, body) = req.into_parts();
let future = Box::pin(async move {
$(
let $ty = match $ty::from_request_parts(&mut parts, &()).await {
Ok(value) => value,

3
axum/src/middleware/from_extractor.rs
View File

@ -214,8 +214,9 @@ where
fn call(&mut self, req: Request<B>) -> Self::Future {
let state = self.state.clone();
let (mut parts, body) = req.into_parts();
let extract_future = Box::pin(async move {
let (mut parts, body) = req.into_parts();
let extracted = E::from_request_parts(&mut parts, &state).await;
let req = Request::from_parts(parts, body);
(req, extracted)

3
axum/src/middleware/from_fn.rs
View File

@ -283,10 +283,9 @@ macro_rules! impl_service {
let mut f = self.f.clone();
let state = self.state.clone();
let (mut parts, body) = req.into_parts();
let future = Box::pin(async move {
let (mut parts, body) = req.into_parts();
$(
let $ty = match $ty::from_request_parts(&mut parts, &state).await {
Ok(value) => value,

3
axum/src/middleware/map_request.rs
View File

@ -282,10 +282,9 @@ macro_rules! impl_service {
let mut f = self.f.clone();
let state = self.state.clone();
let (mut parts, body) = req.into_parts();
let future = Box::pin(async move {
let (mut parts, body) = req.into_parts();
$(
let $ty = match $ty::from_request_parts(&mut parts, &state).await {
Ok(value) => value,

3
axum/src/middleware/map_response.rs
View File

@ -261,10 +261,9 @@ macro_rules! impl_service {
let mut f = self.f.clone();
let _state = self.state.clone();
let (mut parts, body) = req.into_parts();
let future = Box::pin(async move {
let (mut parts, body) = req.into_parts();
$(
let $ty = match $ty::from_request_parts(&mut parts, &_state).await {
Ok(value) => value,