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

Don't panic if worktree was dropped before sending path changes
2023-04-10 08:36:53 +02:00
parent 035189a2a1 372e31d54f
commit 116d4f20fa
1 changed files with 2 additions and 3 deletions
@@ -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"))?