mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Replace postage::oneshot with futures::channel::oneshot

Browse source 
This fixes an error in the randomized test that would cause the future
returned from `Worktree::share` to never finish due to a bug in `postage`
that causes its waker to not be notified upon drop.
This commit is contained in:
Antonio Scandurra 2022-04-08 12:03:09 +02:00
parent da976012a9
commit 3daaef02ca
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/project/src/worktree.rs
View file

@ -11,7 +11,10 @@ use client::{proto, Client, TypedEnvelope};
use clock::ReplicaId; use clock::ReplicaId;
use collections::HashMap; use collections::HashMap;
use futures::{ use futures::{
channel::mpsc::{self, UnboundedSender}, channel::{
mpsc::{self, UnboundedSender},
oneshot,
},
Stream, StreamExt, Stream, StreamExt,
}; };
use fuzzy::CharBag; use fuzzy::CharBag;
@ -26,7 +29,6 @@ use language::{
use lazy_static::lazy_static; use lazy_static::lazy_static;
use parking_lot::Mutex; use parking_lot::Mutex;
use postage::{ use postage::{
oneshot,
prelude::{Sink as _, Stream as _}, prelude::{Sink as _, Stream as _},
watch, watch,
}; };
@ -727,11 +729,11 @@ impl LocalWorktree {
pub fn share(&mut self, project_id: u64, cx: &mut ModelContext<Worktree>) -> Task<Result<()>> { pub fn share(&mut self, project_id: u64, cx: &mut ModelContext<Worktree>) -> Task<Result<()>> {
let register = self.register(project_id, cx); let register = self.register(project_id, cx);
let (mut share_tx, mut share_rx) = oneshot::channel(); let (share_tx, share_rx) = oneshot::channel();
let (snapshots_to_send_tx, snapshots_to_send_rx) = let (snapshots_to_send_tx, snapshots_to_send_rx) =
smol::channel::unbounded::<LocalSnapshot>(); smol::channel::unbounded::<LocalSnapshot>();
if self.share.is_some() { if self.share.is_some() {
let _ = share_tx.try_send(Ok(())); let _ = share_tx.send(Ok(()));
} else { } else {
let rpc = self.client.clone(); let rpc = self.client.clone();
let worktree_id = cx.model_id() as u64; let worktree_id = cx.model_id() as u64;
@ -756,15 +758,15 @@ impl LocalWorktree {
}) })
.await .await
{ {
let _ = share_tx.try_send(Err(error)); let _ = share_tx.send(Err(error));
return Err(anyhow!("failed to send initial update worktree")); return Err(anyhow!("failed to send initial update worktree"));
} else { } else {
let _ = share_tx.try_send(Ok(())); let _ = share_tx.send(Ok(()));
snapshot snapshot
} }
} }
Err(error) => { Err(error) => {
let _ = share_tx.try_send(Err(error.into())); let _ = share_tx.send(Err(error.into()));
return Err(anyhow!("failed to send initial update worktree")); return Err(anyhow!("failed to send initial update worktree"));
} }
}; };
@ -804,9 +806,8 @@ impl LocalWorktree {
}); });
} }
share_rx share_rx
.next()
.await .await
.unwrap_or_else(|| Err(anyhow!("share ended"))) .unwrap_or_else(|_| Err(anyhow!("share ended")))
}) })
} }