Merge branch 'master' into private-items

This commit is contained in:
Adam Wright
2017-01-22 15:13:32 -08:00
committed by GitHub
2 changed files with 2 additions and 6 deletions

View File

@@ -88,10 +88,6 @@ pub extern crate tokio_proto;
#[doc(hidden)]
pub extern crate tokio_service;
#[doc(hidden)]
pub use client::Client;
#[doc(hidden)]
pub use client::future::ConnectFuture;
pub use errors::Error;
#[doc(hidden)]
pub use errors::WireError;

View File

@@ -558,14 +558,14 @@ macro_rules! service {
#[allow(non_camel_case_types)]
type __tarpc_service_Client =
$crate::Client<__tarpc_service_Request,
$crate::client::Client<__tarpc_service_Request,
__tarpc_service_Response,
__tarpc_service_Error>;
#[allow(non_camel_case_types)]
/// Implementation detail: Pending connection.
pub struct __tarpc_service_ConnectFuture<T> {
inner: $crate::futures::Map<$crate::ConnectFuture<__tarpc_service_Request,
inner: $crate::futures::Map<$crate::client::future::ConnectFuture<__tarpc_service_Request,
__tarpc_service_Response,
__tarpc_service_Error>,
fn(__tarpc_service_Client) -> T>,