From b2282f9d7a210b2fdf2400a4981ef85f4a6b1db0 Mon Sep 17 00:00:00 2001
From: Tim Kuehn <tikue@google.com>
Date: Sun, 25 Mar 2018 23:52:36 -0700
Subject: [PATCH] Clean up code warnings

---
 examples/concurrency.rs           | 2 +-
 examples/pubsub.rs                | 2 +-
 examples/server_calling_server.rs | 9 ++++-----
 src/future/server/connection.rs   | 4 ++--
 src/future/server/shutdown.rs     | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/examples/concurrency.rs b/examples/concurrency.rs
index 0f259e4..1434b44 100644
--- a/examples/concurrency.rs
+++ b/examples/concurrency.rs
@@ -3,7 +3,7 @@
 // Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
 // This file may not be copied, modified, or distributed except according to those terms.
 
-#![feature(inclusive_range_syntax, conservative_impl_trait, plugin, never_type, use_extern_macros)]
+#![feature(conservative_impl_trait, plugin, never_type, use_extern_macros)]
 #![plugin(tarpc_plugins)]
 
 extern crate chrono;
diff --git a/examples/pubsub.rs b/examples/pubsub.rs
index be438b0..790e62a 100644
--- a/examples/pubsub.rs
+++ b/examples/pubsub.rs
@@ -117,7 +117,7 @@ impl publisher::FutureService for Publisher {
     fn unsubscribe(&self, id: u32) -> Self::UnsubscribeFut {
         println!("Unsubscribing {}", id);
         self.clients.borrow_mut().remove(&id).unwrap();
-        futures::finished(()).boxed()
+        Box::new(futures::finished(()))
     }
 }
 
diff --git a/examples/server_calling_server.rs b/examples/server_calling_server.rs
index 239e644..d805899 100644
--- a/examples/server_calling_server.rs
+++ b/examples/server_calling_server.rs
@@ -14,7 +14,7 @@ extern crate tokio_core;
 
 use add::{FutureService as AddFutureService, FutureServiceExt as AddExt};
 use double::{FutureService as DoubleFutureService, FutureServiceExt as DoubleExt};
-use futures::{BoxFuture, Future, Stream};
+use futures::{Future, Stream};
 use tarpc::future::{client, server};
 use tarpc::future::client::ClientExt as Fc;
 use tarpc::util::{FirstSocketAddr, Message, Never};
@@ -59,13 +59,12 @@ impl DoubleServer {
 }
 
 impl DoubleFutureService for DoubleServer {
-    type DoubleFut = BoxFuture<i32, Message>;
+    type DoubleFut = Box<Future<Item=i32, Error=Message>>;
 
     fn double(&self, x: i32) -> Self::DoubleFut {
-        self.client
+        Box::new(self.client
             .add(x, x)
-            .map_err(|e| e.to_string().into())
-            .boxed()
+            .map_err(|e| e.to_string().into()))
     }
 }
 
diff --git a/src/future/server/connection.rs b/src/future/server/connection.rs
index 7883ad3..8fb4137 100644
--- a/src/future/server/connection.rs
+++ b/src/future/server/connection.rs
@@ -20,12 +20,12 @@ impl Tracker {
     }
 
     pub fn increment(&self) {
-        let _ = self.tx.send(Action::Increment);
+        let _ = self.tx.unbounded_send(Action::Increment);
     }
 
     pub fn decrement(&self) {
         debug!("Closing connection");
-        let _ = self.tx.send(Action::Decrement);
+        let _ = self.tx.unbounded_send(Action::Decrement);
     }
 }
 
diff --git a/src/future/server/shutdown.rs b/src/future/server/shutdown.rs
index c0c388e..720201c 100644
--- a/src/future/server/shutdown.rs
+++ b/src/future/server/shutdown.rs
@@ -36,7 +36,7 @@ impl Shutdown {
     /// The returned future resolves when the server is completely shut down.
     pub fn shutdown(&self) -> ShutdownFuture {
         let (tx, rx) = oneshot::channel();
-        let inner = if self.tx.send(tx).is_err() {
+        let inner = if self.tx.unbounded_send(tx).is_err() {
             trace!("Server already initiated shutdown.");
             futures::Either::A(futures::ok(()))
         } else {