mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #2366 from zed-industries/avoid-unwrapping-on-try-send

Browse source 
Don't panic if worktree was dropped before sending path changes
This commit is contained in:
Antonio Scandurra 2023-04-10 08:36:53 +02:00 committed by GitHub
commit 116d4f20fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -838,8 +838,7 @@ impl LocalWorktree {
.unwrap()
.path_changes_tx
.try_send((vec![abs_path], tx))
.unwrap();
});
})?;
rx.recv().await;
Ok(())
}))
@ -930,7 +929,7 @@ impl LocalWorktree {
}
let (tx, mut rx) = barrier::channel();
path_changes_tx.try_send((paths, tx)).unwrap();
path_changes_tx.try_send((paths, tx))?;
rx.recv().await;
this.upgrade(&cx)
.ok_or_else(|| anyhow!("worktree was dropped"))?