feat(router): Remove unnecessary BoxBody from response body (#1994)

hyperium · Oct 12, 2024 · 6a75978 · 6a75978
1 parent 0fcd63a
commit 6a75978
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/tonic/Cargo.toml b/tonic/Cargo.toml
@@ -129,6 +129,7 @@ allowed_external_types = [
 
   "async_trait::async_trait",
   "axum_core::body::Body",
+  "axum_core::response::into_response::IntoResponse",
   "axum::routing::Router",
   "futures_core::stream::Stream",
   "h2::error::Error",

diff --git a/tonic/src/service/router.rs b/tonic/src/service/router.rs
@@ -30,11 +30,8 @@ impl RoutesBuilder {
     /// Add a new service.
     pub fn add_service<S>(&mut self, svc: S) -> &mut Self
     where
-        S: Service<Request<BoxBody>, Response = Response<BoxBody>, Error = Infallible>
-            + NamedService
-            + Clone
-            + Send
-            + 'static,
+        S: Service<Request<BoxBody>, Error = Infallible> + NamedService + Clone + Send + 'static,
+        S::Response: axum::response::IntoResponse,
         S::Future: Send + 'static,
     {
         let routes = self.routes.take().unwrap_or_default();
@@ -60,11 +57,8 @@ impl Routes {
     /// Create a new routes with `svc` already added to it.
     pub fn new<S>(svc: S) -> Self
     where
-        S: Service<Request<BoxBody>, Response = Response<BoxBody>, Error = Infallible>
-            + NamedService
-            + Clone
-            + Send
-            + 'static,
+        S: Service<Request<BoxBody>, Error = Infallible> + NamedService + Clone + Send + 'static,
+        S::Response: axum::response::IntoResponse,
         S::Future: Send + 'static,
     {
         Self::default().add_service(svc)
@@ -78,11 +72,8 @@ impl Routes {
     /// Add a new service.
     pub fn add_service<S>(mut self, svc: S) -> Self
     where
-        S: Service<Request<BoxBody>, Response = Response<BoxBody>, Error = Infallible>
-            + NamedService
-            + Clone
-            + Send
-            + 'static,
+        S: Service<Request<BoxBody>, Error = Infallible> + NamedService + Clone + Send + 'static,
+        S::Response: axum::response::IntoResponse,
         S::Future: Send + 'static,
     {
         self.router = self.router.route_service(