From 5d7bfc22c590982463f2d93464b0a7fb90e17083 Mon Sep 17 00:00:00 2001 From: tottoto Date: Sun, 23 Jun 2024 18:16:00 +0900 Subject: [PATCH] feat(transport): Rename reexported axum body (#1752) --- examples/src/h2c/server.rs | 4 ++-- tonic/src/transport/mod.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/src/h2c/server.rs b/examples/src/h2c/server.rs index cf981f957..838730f86 100644 --- a/examples/src/h2c/server.rs +++ b/examples/src/h2c/server.rs @@ -71,7 +71,7 @@ mod h2c { use http::{Request, Response}; use hyper::body::Incoming; use hyper_util::{rt::TokioExecutor, service::TowerToHyperService}; - use tonic::{body::empty_body, transport::AxumBoxBody}; + use tonic::{body::empty_body, transport::AxumBody}; use tower::Service; #[derive(Clone)] @@ -83,7 +83,7 @@ mod h2c { impl Service> for H2c where - S: Service, Response = Response> + Clone + Send + 'static, + S: Service, Response = Response> + Clone + Send + 'static, S::Future: Send + 'static, S::Error: Into + Sync + Send + 'static, S::Response: Send + 'static, diff --git a/tonic/src/transport/mod.rs b/tonic/src/transport/mod.rs index 388ca6323..ef1ebe379 100644 --- a/tonic/src/transport/mod.rs +++ b/tonic/src/transport/mod.rs @@ -112,7 +112,7 @@ pub use self::service::grpc_timeout::TimeoutExpired; #[cfg(feature = "tls")] pub use self::tls::Certificate; #[cfg(feature = "server")] -pub use axum::{body::Body as AxumBoxBody, Router as AxumRouter}; +pub use axum::{body::Body as AxumBody, Router as AxumRouter}; pub use hyper::{body::Body, Uri}; #[cfg(feature = "tls")] pub use tokio_rustls::rustls::pki_types::CertificateDer;