From c976ca710aca7a59d9cda68f1062b23b83da67b4 Mon Sep 17 00:00:00 2001
From: Tim Kuehn <tikue@google.com>
Date: Tue, 17 Jan 2017 15:35:25 -0800
Subject: [PATCH 1/2] Make private a couple items that no longer need to be
 public.

---
 src/lib.rs    | 3 +--
 src/server.rs | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 13f2176..69f6f7f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -119,8 +119,7 @@ use tokio_core::reactor;
 
 lazy_static! {
     /// The `Remote` for the default reactor core.
-    #[doc(hidden)]
-    pub static ref REMOTE: reactor::Remote = {
+    static ref REMOTE: reactor::Remote = {
         spawn_core()
     };
 }
diff --git a/src/server.rs b/src/server.rs
index 35f5d05..29e34a7 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -72,9 +72,9 @@ pub fn listen<S, Req, Resp, E>(new_service: S, addr: SocketAddr, options: Option
         }
     }
 }
+
 /// Spawns a service that binds to the given address using the given handle.
-#[doc(hidden)]
-pub fn listen_with<S, Req, Resp, E>(new_service: S,
+fn listen_with<S, Req, Resp, E>(new_service: S,
                                     addr: SocketAddr,
                                     handle: Handle)
                                     -> io::Result<SocketAddr>

From 802ee838ca447a09e1a90350a611d2d26b3c8195 Mon Sep 17 00:00:00 2001
From: Tim Kuehn <tikue@google.com>
Date: Tue, 17 Jan 2017 16:38:30 -0800
Subject: [PATCH 2/2] Don't reexport client implementation details from crate
 root.

---
 src/lib.rs    | 4 ----
 src/macros.rs | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 13f2176..eb8ff06 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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;
diff --git a/src/macros.rs b/src/macros.rs
index fff5c44..768e345 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -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>,