From 6288ac2e21f1af405297fad02284c2f07990d122 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 19 Aug 2021 19:58:13 +0200
Subject: [PATCH] Fix double borrow panic

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
---
 zed/src/worktree.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zed/src/worktree.rs b/zed/src/worktree.rs
index 18f057dbab0a5e818813422270689d238fcb7bfc..d24c1b412eb8596dd30088a21f8eb2b1d5b497df 100644
--- a/zed/src/worktree.rs
+++ b/zed/src/worktree.rs
@@ -459,7 +459,9 @@ impl Worktree {
         let receipt = envelope.receipt();
         let worktree_id = envelope.payload.worktree_id;
         let buffer_id = envelope.payload.buffer_id;
-        let save = buffer.update(cx, |buffer, cx| buffer.save(cx))?;
+        let save = cx.spawn(|_, mut cx| async move {
+            buffer.update(&mut cx, |buffer, cx| buffer.save(cx))?.await
+        });
 
         cx.background()
             .spawn(log_async_errors(async move {