chore(transport) Re-export axum::Router as AxumRouter (#1483)

* chore(transport) Re-export axum::Router as AxumRouter * chore(transport): Re-export axum::body::BoxBody As AxumBoxBody * chore(examples): Use re-exported axum BoxBody --------- Co-authored-by: Lucio Franco <luciofranco14@gmail.com>
hyperium · Sep 1, 2023 · 6db46e0 · 6db46e0
1 parent 76eedc1
commit 6db46e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -299,10 +299,10 @@ dynamic-load-balance = ["dep:tower"]
 timeout = ["tokio/time", "dep:tower"]
 tls-client-auth = ["tonic/tls"]
 types = ["dep:tonic-types"]
-h2c = ["dep:hyper", "dep:axum", "dep:tower", "dep:http"]
+h2c = ["dep:hyper", "dep:tower", "dep:http"]
 cancellation = ["dep:tokio-util"]
 
-full = ["gcp", "routeguide", "reflection", "autoreload", "health", "grpc-web", "tracing", "hyper-warp", "hyper-warp-multiplex", "uds", "streaming", "mock", "tower", "json-codec", "compression", "tls", "tls-rustls", "dynamic-load-balance", "timeout", "tls-client-auth", "types", "cancellation"]
+full = ["gcp", "routeguide", "reflection", "autoreload", "health", "grpc-web", "tracing", "hyper-warp", "hyper-warp-multiplex", "uds", "streaming", "mock", "tower", "json-codec", "compression", "tls", "tls-rustls", "dynamic-load-balance", "timeout", "tls-client-auth", "types", "cancellation", "h2c"]
 default = ["full"]
 
 [dependencies]
@@ -315,7 +315,6 @@ tonic-web = { path = "../tonic-web", optional = true }
 tonic-health = { path = "../tonic-health", optional = true }
 tonic-reflection = { path = "../tonic-reflection", optional = true }
 tonic-types = { path = "../tonic-types", optional = true }
-axum = { version = "0.6", optional = true }
 either = { version = "1.9", optional = true }
 async-stream = { version = "0.3", optional = true }
 tokio-stream = { version = "0.1", optional = true }

diff --git a/examples/src/h2c/server.rs b/examples/src/h2c/server.rs
@@ -61,7 +61,7 @@ mod h2c {
 
     impl<S> Service<Request<Body>> for H2c<S>
     where
-        S: Service<Request<Body>, Response = Response<axum::body::BoxBody>>
+        S: Service<Request<Body>, Response = Response<tonic::transport::AxumBoxBody>>
             + Clone
             + Send
             + 'static,

diff --git a/tonic/src/transport/mod.rs b/tonic/src/transport/mod.rs
@@ -106,6 +106,7 @@ pub use self::service::grpc_timeout::TimeoutExpired;
 pub use self::tls::Certificate;
 #[doc(inline)]
 pub use crate::server::NamedService;
+pub use axum::{body::BoxBody as AxumBoxBody, Router as AxumRouter};
 pub use hyper::{Body, Uri};
 
 pub(crate) use self::service::executor::Executor;