tokio-rs/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2026-08-31 00:00:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove B type param: Follow ups (#1789)

Browse Source 
Co-authored-by: Jonas Platte <[email protected]>
Co-authored-by: Michael Scofield <[email protected]>
This commit is contained in:
David Pedersen
2023-03-23 20:24:58 +01:00
co-authored by Jonas Platte Michael Scofield
parent 0d50d17304
commit 2ae0cdf7cf
70 changed files with 428 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/rest-grpc-multiplex/src/multiplex_service.rs
+11 -7
View File
@@ -1,6 +1,10 @@
use axum::{body::BoxBody, http::header::CONTENT_TYPE, response::IntoResponse};
use axum::{
body::Body,
extract::Request,
http::header::CONTENT_TYPE,
response::{IntoResponse, Response},
};
use futures::{future::BoxFuture, ready};
use hyper::{Body, Request, Response};
use std::{
convert::Infallible,
task::{Context, Poll},
@@ -41,16 +45,16 @@ where
}
}
impl<A, B> Service<Request<Body>> for MultiplexService<A, B>
impl<A, B> Service<Request<hyper::Body>> for MultiplexService<A, B>
where
A: Service<Request<Body>, Error = Infallible>,
A: Service<Request<hyper::Body>, Error = Infallible>,
A::Response: IntoResponse,
A::Future: Send + 'static,
B: Service<Request<Body>, Error = Infallible>,
B: Service<Request<hyper::Body>, Error = Infallible>,
B::Response: IntoResponse,
B::Future: Send + 'static,
{
type Response = Response<BoxBody>;
type Response = Response<Body>;
type Error = Infallible;
type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
@@ -73,7 +77,7 @@ where
}
}
fn call(&mut self, req: Request<Body>) -> Self::Future {
fn call(&mut self, req: Request<hyper::Body>) -> Self::Future {
// require users to call `poll_ready` first, if they don't we're allowed to panic
// as per the `tower::Service` contract
assert!(