OpenSource/axum
OpenSource/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2025-01-11 12:31:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Cached<T> as the last argument of a handler function (#1428)

Browse source 
* Remove FromRequest impl for Cached<T>

* Add a test for Cached<T> as the last argument of a handler function
This commit is contained in:
Jonas Platte 2022-09-28 11:06:15 +02:00 committed by GitHub
parent 2c833ad276
commit 410fd49aa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
axum-extra/src/extract/cached.rs
View file

@ -1,8 +1,8 @@
use axum::{
async_trait,
extract::{Extension, FromRequest, FromRequestParts},
extract::{Extension, FromRequestParts},
};
use http::{request::Parts, Request};
use http::request::Parts;
use std::ops::{Deref, DerefMut};
/// Cache results of other extractors.
@ -88,29 +88,6 @@ pub struct Cached<T>(pub T);
#[derive(Clone)]
struct CachedEntry<T>(T);
#[async_trait]
impl<S, B, T> FromRequest<S, B> for Cached<T>
where
B: Send + 'static,
S: Send + Sync,
T: FromRequestParts<S> + Clone + Send + Sync + 'static,
{
type Rejection = T::Rejection;
async fn from_request(req: Request<B>, state: &S) -> Result<Self, Self::Rejection> {
let (mut parts, _) = req.into_parts();
match Extension::<CachedEntry<T>>::from_request_parts(&mut parts, state).await {
Ok(Extension(CachedEntry(value))) => Ok(Self(value)),
Err(_) => {
let value = T::from_request_parts(&mut parts, state).await?;
parts.extensions.insert(CachedEntry(value.clone()));
Ok(Self(value))
}
}
}
}
#[async_trait]
impl<S, T> FromRequestParts<S> for Cached<T>
where
@ -148,7 +125,7 @@ impl<T> DerefMut for Cached<T> {
#[cfg(test)]
mod tests {
use super::*;
use axum::{extract::FromRequestParts, http::Request};
use axum::{extract::FromRequestParts, http::Request, routing::get, Router};
use http::request::Parts;
use std::{
convert::Infallible,
@ -195,4 +172,10 @@ mod tests {
assert_eq!(first, second);
}
// Not a #[test], we just want to know this compiles
async fn _last_handler_argument() {
async fn handler(_: http::Method, _: Cached<http::HeaderMap>) {}
let _r: Router = Router::new().route("/", get(handler));
}
}