move MakeConnection re-export to codegen to clean up imports in gener…

…ated code
hyperium · Nov 22, 2019 · 2969071 · 2969071
1 parent 6f478b0
commit 2969071
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/tonic-build/src/client.rs b/tonic-build/src/client.rs
@@ -67,7 +67,7 @@ fn generate_connect(service_ident: &syn::Ident) -> TokenStream {
             /// connector.
             pub async fn connect_with_connector<C, D>(dst: D, connector: C) -> Result<Self, tonic::transport::Error>
             where
-                C: tonic::transport::MakeConnection<http::Uri> + Send + 'static,
+                C: MakeConnection<http::Uri> + Send + 'static,
                 C::Connection: Unpin + Send + 'static,
                 C::Future: Send + 'static,
                 C::Error: Into<Box<dyn std::error::Error + Send + Sync>> + Send,

diff --git a/tonic/src/codegen.rs b/tonic/src/codegen.rs
@@ -9,6 +9,8 @@ pub use std::future::Future;
 pub use std::pin::Pin;
 pub use std::sync::Arc;
 pub use std::task::{Context, Poll};
+#[cfg(feature = "transport")]
+pub use tower_make::MakeConnection;
 pub use tower_service::Service;
 pub type StdError = Box<dyn std::error::Error + Send + Sync + 'static>;
 pub use crate::body::Body;

diff --git a/tonic/src/transport/mod.rs b/tonic/src/transport/mod.rs
@@ -107,7 +107,6 @@ pub use self::error::Error;
 pub use self::server::{Server, ServiceName};
 pub use self::tls::{Certificate, Identity};
 pub use hyper::Body;
-pub use tower_make::MakeConnection;
 
 #[cfg(feature = "tls")]
 pub use self::endpoint::ClientTlsConfig;