diff --git a/interop/src/server.rs b/interop/src/server.rs index 047de36c7..a1fdaea32 100644 --- a/interop/src/server.rs +++ b/interop/src/server.rs @@ -7,7 +7,7 @@ use std::future::Future; use std::pin::Pin; use std::task::{Context, Poll}; use std::time::Duration; -use tonic::{body::BoxBody, transport::ServiceName, Code, Request, Response, Status}; +use tonic::{body::BoxBody, transport::NamedService, Code, Request, Response, Status}; use tower::Service; pub use pb::test_service_server::TestServiceServer; @@ -170,7 +170,7 @@ pub struct EchoHeadersSvc { inner: S, } -impl ServiceName for EchoHeadersSvc { +impl NamedService for EchoHeadersSvc { const NAME: &'static str = S::NAME; } diff --git a/tonic-build/src/server.rs b/tonic-build/src/server.rs index 61114a380..05bd28a30 100644 --- a/tonic-build/src/server.rs +++ b/tonic-build/src/server.rs @@ -188,7 +188,7 @@ fn generate_transport( let service_name = syn::LitStr::new(service_name, proc_macro2::Span::call_site()); quote! { - impl tonic::transport::ServiceName for #server_service { + impl tonic::transport::NamedService for #server_service { const NAME: &'static str = #service_name; } } diff --git a/tonic/src/transport/mod.rs b/tonic/src/transport/mod.rs index 192264ff2..c970ee314 100644 --- a/tonic/src/transport/mod.rs +++ b/tonic/src/transport/mod.rs @@ -63,7 +63,7 @@ //! # unimplemented!() //! # } //! # } -//! # impl tonic::transport::ServiceName for Svc { +//! # impl tonic::transport::NamedService for Svc { //! # const NAME: &'static str = "some_svc"; //! # } //! # let my_svc = Svc; @@ -97,7 +97,7 @@ mod tls; pub use self::channel::{Channel, Endpoint}; pub use self::error::Error; #[doc(inline)] -pub use self::server::{Server, ServiceName}; +pub use self::server::{NamedService, Server}; pub use self::tls::{Certificate, Identity}; pub use hyper::{Body, Uri}; diff --git a/tonic/src/transport/server/mod.rs b/tonic/src/transport/server/mod.rs index 0b07bb0af..4ff5aa04b 100644 --- a/tonic/src/transport/server/mod.rs +++ b/tonic/src/transport/server/mod.rs @@ -73,7 +73,7 @@ pub struct Router { /// A trait to provide a static reference to the service's /// name. This is used for routing service's within the router. -pub trait ServiceName { +pub trait NamedService { /// The `Service-Name` as described [here]. /// /// [here]: https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#requests @@ -211,7 +211,7 @@ impl Server { pub fn add_service(&mut self, svc: S) -> Router where S: Service, Response = Response> - + ServiceName + + NamedService + Clone + Send + 'static, @@ -277,14 +277,14 @@ impl Router { pub(crate) fn new(server: Server, svc: S) -> Self where S: Service, Response = Response> - + ServiceName + + NamedService + Clone + Send + 'static, S::Future: Send + 'static, S::Error: Into + Send, { - let svc_name = ::NAME; + let svc_name = ::NAME; let svc_route = format!("/{}", svc_name); let pred = move |req: &Request| { let path = req.uri().path(); @@ -311,7 +311,7 @@ where pub fn add_service(self, svc: S) -> Router>> where S: Service, Response = Response> - + ServiceName + + NamedService + Clone + Send + 'static, @@ -320,7 +320,7 @@ where { let Self { routes, server } = self; - let svc_name = ::NAME; + let svc_name = ::NAME; let svc_route = format!("/{}", svc_name); let pred = move |req: &Request| { let path = req.uri().path();