diff --git a/tonic/src/transport/server/incoming.rs b/tonic/src/transport/server/incoming.rs index 75f33fa23..fe578b2a5 100644 --- a/tonic/src/transport/server/incoming.rs +++ b/tonic/src/transport/server/incoming.rs @@ -1,6 +1,6 @@ +use super::service::ServerIo; #[cfg(feature = "tls")] use super::service::TlsAcceptor; -use super::{service::ServerIo, Connected}; use std::{ net::{SocketAddr, TcpListener as StdTcpListener}, pin::{pin, Pin}, @@ -20,7 +20,7 @@ pub(crate) fn tcp_incoming( incoming: impl Stream>, ) -> impl Stream, crate::Error>> where - IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static, + IO: AsyncRead + AsyncWrite + Unpin + Send + 'static, IE: Into, { async_stream::try_stream! { @@ -38,7 +38,7 @@ pub(crate) fn tcp_incoming( tls: Option, ) -> impl Stream, crate::Error>> where - IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static, + IO: AsyncRead + AsyncWrite + Unpin + Send + 'static, IE: Into, { async_stream::try_stream! { diff --git a/tonic/src/transport/server/service/tls.rs b/tonic/src/transport/server/service/tls.rs index d7667b493..9ec9b814f 100644 --- a/tonic/src/transport/server/service/tls.rs +++ b/tonic/src/transport/server/service/tls.rs @@ -8,7 +8,6 @@ use tokio_rustls::{ }; use crate::transport::{ - server::Connected, service::tls::{add_certs_from_pem, load_identity, ALPN_H2}, Certificate, Identity, }; @@ -52,7 +51,7 @@ impl TlsAcceptor { pub(crate) async fn accept(&self, io: IO) -> Result, crate::Error> where - IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static, + IO: AsyncRead + AsyncWrite + Unpin + Send + 'static, { let acceptor = RustlsAcceptor::from(self.inner.clone()); acceptor.accept(io).await.map_err(Into::into)