From 315bb09a6ea5084828d60df014ed6b6311ef379c Mon Sep 17 00:00:00 2001 From: tottoto Date: Mon, 8 Jul 2024 18:12:33 +0900 Subject: [PATCH] feat(server): Remove reexporting service router (#1773) --- examples/src/dynamic/server.rs | 2 +- tests/integration_tests/tests/routes_builder.rs | 2 +- tonic/src/transport/server/mod.rs | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/src/dynamic/server.rs b/examples/src/dynamic/server.rs index 300ec868c..14e0bee3e 100644 --- a/examples/src/dynamic/server.rs +++ b/examples/src/dynamic/server.rs @@ -1,5 +1,5 @@ use std::env; -use tonic::{transport::server::RoutesBuilder, transport::Server, Request, Response, Status}; +use tonic::{service::RoutesBuilder, transport::Server, Request, Response, Status}; use hello_world::greeter_server::{Greeter, GreeterServer}; use hello_world::{HelloReply, HelloRequest}; diff --git a/tests/integration_tests/tests/routes_builder.rs b/tests/integration_tests/tests/routes_builder.rs index 7bcbfad37..09adc5117 100644 --- a/tests/integration_tests/tests/routes_builder.rs +++ b/tests/integration_tests/tests/routes_builder.rs @@ -7,7 +7,7 @@ use integration_tests::pb::{ test1_client, test1_server, test_client, test_server, Input, Input1, Output, Output1, }; use tonic::codegen::BoxStream; -use tonic::transport::server::RoutesBuilder; +use tonic::service::RoutesBuilder; use tonic::{ transport::{Endpoint, Server}, Request, Response, Status, diff --git a/tonic/src/transport/server/mod.rs b/tonic/src/transport/server/mod.rs index fca893ff2..990ef3074 100644 --- a/tonic/src/transport/server/mod.rs +++ b/tonic/src/transport/server/mod.rs @@ -11,8 +11,7 @@ mod unix; use tokio_stream::StreamExt as _; use tracing::{debug, trace}; -/// A deprecated re-export. Please use `tonic::service::{Routes, RoutesBuilder}` directly. -pub use crate::service::{Routes, RoutesBuilder}; +use crate::service::Routes; pub use conn::{Connected, TcpConnectInfo}; use hyper_util::{