Skip to content

chore(server): Remove unnecessary Connected trait bound #1796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djc merged 1 commit into from
Jul 13, 2024
Merged

chore(server): Remove unnecessary Connected trait bound #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
chore(server): Remove unnecessary Connected trait bound
  • Loading branch information
@tottoto
tottoto committed Jul 13, 2024
commit d6a5e65370c39841c7397503ce9bf25747a438d0
6 changes: 3 additions & 3 deletions tonic/src/transport/server/incoming.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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},
Expand All @@ -20,7 +20,7 @@ pub(crate) fn tcp_incoming<IO, IE>(
incoming: impl Stream<Item = Result<IO, IE>>,
) -> impl Stream<Item = Result<ServerIo<IO>, crate::Error>>
where
IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static,
IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
IE: Into<crate::Error>,
{
async_stream::try_stream! {
Expand All @@ -38,7 +38,7 @@ pub(crate) fn tcp_incoming<IO, IE>(
tls: Option<TlsAcceptor>,
) -> impl Stream<Item = Result<ServerIo<IO>, crate::Error>>
where
IO: AsyncRead + AsyncWrite + Connected + Unpin + Send + 'static,
IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
IE: Into<crate::Error>,
{
async_stream::try_stream! {
Expand Down
3 changes: 1 addition & 2 deletions tonic/src/transport/server/service/tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use tokio_rustls::{
};

use crate::transport::{
server::Connected,
service::tls::{add_certs_from_pem, load_identity, ALPN_H2},
Certificate, Identity,
};
Expand Down Expand Up @@ -52,7 +51,7 @@ impl TlsAcceptor {

pub(crate) async fn accept<IO>(&self, io: IO) -> Result<TlsStream<IO>, 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)
Expand Down