Skip to content

Commit

Permalink
fix(transport): connect w/ connector infailable (#922)
Browse files Browse the repository at this point in the history
  • Loading branch information
LucioFranco authored Feb 22, 2022
1 parent ee6e726 commit a197c20
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions tests/integration_tests/tests/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ async fn status_from_server_stream_with_source() {
.unwrap()
.connect_with_connector_lazy(tower::service_fn(move |_: Uri| async move {
Err::<MockStream, _>(std::io::Error::new(std::io::ErrorKind::Other, "WTF"))
}))
.unwrap();
}));

let mut client = test_stream_client::TestStreamClient::new(channel);

Expand Down
4 changes: 2 additions & 2 deletions tonic/src/transport/channel/endpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ impl Endpoint {
///
/// See the `uds` example for an example on how to use this function to build channel that
/// uses a Unix socket transport.
pub fn connect_with_connector_lazy<C>(&self, connector: C) -> Result<Channel, Error>
pub fn connect_with_connector_lazy<C>(&self, connector: C) -> Channel
where
C: MakeConnection<Uri> + Send + 'static,
C::Connection: Unpin + Send + 'static,
Expand All @@ -359,7 +359,7 @@ impl Endpoint {
#[cfg(not(feature = "tls"))]
let connector = service::connector(connector);

Ok(Channel::new(connector, self.clone()))
Channel::new(connector, self.clone())
}

/// Get the endpoint uri.
Expand Down

0 comments on commit a197c20

Please sign in to comment.