mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 00:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

💄

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-15 11:03:14 +02:00
parent 1d9cfe6b64
commit 04bf84af44
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zed/src/rpc_client.rs
View file

@ -60,13 +60,15 @@ where
Mutex<HashMap<i32, (mpsc::Sender<proto::from_server::Variant>, bool)>>, Mutex<HashMap<i32, (mpsc::Sender<proto::from_server::Variant>, bool)>>,
>, >,
) { ) {
let dropped = drop_rx.recv();
smol::pin!(dropped);
let mut stream = MessageStream::new(conn); let mut stream = MessageStream::new(conn);
loop { loop {
let read_message = stream.read_message::<proto::FromServer>(); let read_message = stream.read_message::<proto::FromServer>();
let dropped = drop_rx.recv(); smol::pin!(read_message);
smol::pin!(read_message, dropped);
match futures::future::select(&mut read_message, &mut dropped).await { match futures::future::select(read_message, &mut dropped).await {
Either::Left((Ok(incoming), _)) => { Either::Left((Ok(incoming), _)) => {
if let Some(variant) = incoming.variant { if let Some(variant) = incoming.variant {
if let Some(request_id) = incoming.request_id { if let Some(request_id) = incoming.request_id {