feat: Make boxed function public (#1754)

hyperium · Jul 6, 2024 · 2cc868f · 2cc868f
1 parent cdfbf2a
commit 2cc868f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/examples/src/h2c/server.rs b/examples/src/h2c/server.rs
@@ -4,7 +4,7 @@ use hyper_util::rt::{TokioExecutor, TokioIo};
 use hyper_util::server::conn::auto::Builder;
 use hyper_util::service::TowerToHyperService;
 use tokio::net::TcpListener;
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{service::Routes, Request, Response, Status};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};
@@ -39,9 +39,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("GreeterServer listening on {}", addr);
 
     let incoming = TcpListener::bind(addr).await?;
-    let svc = Server::builder()
-        .add_service(GreeterServer::new(greeter))
-        .into_router();
+    let svc = Routes::new(GreeterServer::new(greeter));
 
     let h2c = h2c::H2c { s: svc };
 
@@ -71,8 +69,8 @@ mod h2c {
     use http::{Request, Response};
     use hyper::body::Incoming;
     use hyper_util::{rt::TokioExecutor, service::TowerToHyperService};
-    use tonic::{body::empty_body, service::AxumBody};
-    use tower::Service;
+    use tonic::body::{empty_body, BoxBody};
+    use tower::{Service, ServiceExt};
 
     #[derive(Clone)]
     pub struct H2c<S> {
@@ -83,12 +81,12 @@ mod h2c {
 
     impl<S> Service<Request<Incoming>> for H2c<S>
     where
-        S: Service<Request<Incoming>, Response = Response<AxumBody>> + Clone + Send + 'static,
+        S: Service<Request<BoxBody>, Response = Response<BoxBody>> + Clone + Send + 'static,
         S::Future: Send + 'static,
         S::Error: Into<BoxError> + Sync + Send + 'static,
         S::Response: Send + 'static,
     {
-        type Response = hyper::Response<tonic::body::BoxBody>;
+        type Response = hyper::Response<BoxBody>;
         type Error = hyper::Error;
         type Future =
             Pin<Box<dyn std::future::Future<Output = Result<Self::Response, Self::Error>> + Send>>;
@@ -100,8 +98,12 @@ mod h2c {
             std::task::Poll::Ready(Ok(()))
         }
 
-        fn call(&mut self, mut req: hyper::Request<Incoming>) -> Self::Future {
-            let svc = self.s.clone();
+        fn call(&mut self, req: hyper::Request<Incoming>) -> Self::Future {
+            let mut req = req.map(tonic::body::boxed);
+            let svc = self
+                .s
+                .clone()
+                .map_request(|req: Request<_>| req.map(tonic::body::boxed));
             Box::pin(async move {
                 tokio::spawn(async move {
                     let upgraded_io = hyper::upgrade::on(&mut req).await.unwrap();

diff --git a/tonic/src/body.rs b/tonic/src/body.rs
@@ -6,7 +6,7 @@ use http_body_util::BodyExt;
 pub type BoxBody = http_body_util::combinators::UnsyncBoxBody<bytes::Bytes, crate::Status>;
 
 /// Convert a [`http_body::Body`] into a [`BoxBody`].
-pub(crate) fn boxed<B>(body: B) -> BoxBody
+pub fn boxed<B>(body: B) -> BoxBody
 where
     B: http_body::Body<Data = bytes::Bytes> + Send + 'static,
     B::Error: Into<crate::Error>,