itsscb/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2025-10-02 07:20:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

More flexible handlers

Browse Source
This commit is contained in:
David Pedersen 2021-05-30 01:35:17 +02:00
parent 0513b56faf
commit 5efa7ab7ea
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib.rs
View File

@ -160,16 +160,20 @@ pub enum Error {
// TODO(david): make this trait sealed // TODO(david): make this trait sealed
#[async_trait] #[async_trait]
pub trait Handler<Out> { pub trait Handler<Out> {
async fn call(self, req: Request<Body>) -> Result<Response<Body>, Error>; type ResponseBody;
async fn call(self, req: Request<Body>) -> Result<Response<Self::ResponseBody>, Error>;
} }
#[async_trait] #[async_trait]
impl<F, Fut> Handler<()> for F impl<F, Fut, B> Handler<()> for F
where where
F: Fn(Request<Body>) -> Fut + Send + Sync, F: Fn(Request<Body>) -> Fut + Send + Sync,
Fut: Future<Output = Result<Response<Body>, Error>> + Send, Fut: Future<Output = Result<Response<B>, Error>> + Send,
{ {
async fn call(self, req: Request<Body>) -> Result<Response<Body>, Error> { type ResponseBody = B;
async fn call(self, req: Request<Body>) -> Result<Response<Self::ResponseBody>, Error> {
self(req).await self(req).await
} }
} }
@ -178,13 +182,15 @@ macro_rules! impl_handler {
( $head:ident $(,)? ) => { ( $head:ident $(,)? ) => {
#[async_trait] #[async_trait]
#[allow(non_snake_case)] #[allow(non_snake_case)]
impl<F, Fut, $head> Handler<($head,)> for F impl<F, Fut, B, $head> Handler<($head,)> for F
where where
F: Fn(Request<Body>, $head) -> Fut + Send + Sync, F: Fn(Request<Body>, $head) -> Fut + Send + Sync,
Fut: Future<Output = Result<Response<Body>, Error>> + Send, Fut: Future<Output = Result<Response<B>, Error>> + Send,
$head: FromRequest + Send, $head: FromRequest + Send,
{ {
async fn call(self, mut req: Request<Body>) -> Result<Response<Body>, Error> { type ResponseBody = B;
async fn call(self, mut req: Request<Body>) -> Result<Response<Self::ResponseBody>, Error> {
let $head = $head::from_request(&mut req).await?; let $head = $head::from_request(&mut req).await?;
let res = self(req, $head).await?; let res = self(req, $head).await?;
Ok(res) Ok(res)
@ -195,14 +201,16 @@ macro_rules! impl_handler {
( $head:ident, $($tail:ident),* $(,)? ) => { ( $head:ident, $($tail:ident),* $(,)? ) => {
#[async_trait] #[async_trait]
#[allow(non_snake_case)] #[allow(non_snake_case)]
impl<F, Fut, $head, $($tail,)*> Handler<($head, $($tail,)*)> for F impl<F, Fut, B, $head, $($tail,)*> Handler<($head, $($tail,)*)> for F
where where
F: Fn(Request<Body>, $head, $($tail,)*) -> Fut + Send + Sync, F: Fn(Request<Body>, $head, $($tail,)*) -> Fut + Send + Sync,
Fut: Future<Output = Result<Response<Body>, Error>> + Send, Fut: Future<Output = Result<Response<B>, Error>> + Send,
$head: FromRequest + Send, $head: FromRequest + Send,
$( $tail: FromRequest + Send, )* $( $tail: FromRequest + Send, )*
{ {
async fn call(self, mut req: Request<Body>) -> Result<Response<Body>, Error> { type ResponseBody = B;
async fn call(self, mut req: Request<Body>) -> Result<Response<Self::ResponseBody>, Error> {
let $head = $head::from_request(&mut req).await?; let $head = $head::from_request(&mut req).await?;
$( $(
let $tail = $tail::from_request(&mut req).await?; let $tail = $tail::from_request(&mut req).await?;
@ -238,8 +246,9 @@ where
impl<H, T> Service<Request<Body>> for HandlerSvc<H, T> impl<H, T> Service<Request<Body>> for HandlerSvc<H, T>
where where
H: Handler<T> + Clone + 'static, H: Handler<T> + Clone + 'static,
H::ResponseBody: 'static,
{ {
type Response = Response<Body>; type Response = Response<H::ResponseBody>;
type Error = Error; type Error = Error;
type Future = future::BoxFuture<'static, Result<Self::Response, Self::Error>>; type Future = future::BoxFuture<'static, Result<Self::Response, Self::Error>>;