From 6c8d4be462b7e44cb97bf833f667ffd9960f0545 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Mon, 15 Apr 2019 20:29:34 +0300
Subject: [PATCH] future::join as freestanding function

---
 rpc/src/transport/channel.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rpc/src/transport/channel.rs b/rpc/src/transport/channel.rs
index 704391c..4d14421 100644
--- a/rpc/src/transport/channel.rs
+++ b/rpc/src/transport/channel.rs
@@ -129,8 +129,11 @@ mod tests {
             Ok::<_, io::Error>((response1, response2))
         };
 
-        let (response1, response2) =
-            run_future(server.join(responses.unwrap_or_else(|e| panic!(e)))).1;
+        let (response1, response2) = run_future(future::join(
+            server,
+            responses.unwrap_or_else(|e| panic!(e)),
+        ))
+        .1;
 
         trace!("response1: {:?}, response2: {:?}", response1, response2);