From 04bf84af44100490f360291e9b98211ab5e79d9e Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 15 Jun 2021 11:03:14 +0200
Subject: [PATCH] :lipstick:

---
 zed/src/rpc_client.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/zed/src/rpc_client.rs b/zed/src/rpc_client.rs
index 69d041104f..2f6849e3da 100644
--- a/zed/src/rpc_client.rs
+++ b/zed/src/rpc_client.rs
@@ -60,13 +60,15 @@ where
             Mutex<HashMap<i32, (mpsc::Sender<proto::from_server::Variant>, bool)>>,
         >,
     ) {
+        let dropped = drop_rx.recv();
+        smol::pin!(dropped);
+
         let mut stream = MessageStream::new(conn);
         loop {
             let read_message = stream.read_message::<proto::FromServer>();
-            let dropped = drop_rx.recv();
-            smol::pin!(read_message, dropped);
+            smol::pin!(read_message);
 
-            match futures::future::select(&mut read_message, &mut dropped).await {
+            match futures::future::select(read_message, &mut dropped).await {
                 Either::Left((Ok(incoming), _)) => {
                     if let Some(variant) = incoming.variant {
                         if let Some(request_id) = incoming.request_id {