From ed90f4ecea627e43b3b9a4d3479098f4373973e1 Mon Sep 17 00:00:00 2001
From: Tim Kuehn <tikue@google.com>
Date: Wed, 1 Feb 2017 22:48:49 -0800
Subject: [PATCH] Merge master into sync-reactor

---
 src/macros.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/macros.rs b/src/macros.rs
index df092e9..e5bb867 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -552,11 +552,11 @@ macro_rules! service {
                 let addr_ = $crate::util::FirstSocketAddr::try_first_socket_addr(&addr_)?;
                 let mut reactor_ = $crate::tokio_core::reactor::Core::new()?;
                 let options_ = options_.handle(reactor_.handle());
-                let client_ = <$crate::client::future::Client<_, _, _>
-                    as $crate::client::future::Connect>::connect(addr_, options_);
+                let client_ = <FutureClient as $crate::client::future::Connect>::connect(addr_,
+                                                                                         options_);
                 let client_ = reactor_.run(client_)?;
                 ::std::result::Result::Ok(SyncClient {
-                    inner: FutureClient(client_),
+                    inner: client_,
                     reactor: reactor_,
                 })
             }