From ed1c2bd29e0b115e7fec305e011ea4cff18ed93d Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 11 Jan 2024 16:31:28 -0800
Subject: [PATCH] Fix failure to write to keychain when signing in or failing
 to sign in (#4031)

Release Notes:

- Fixed an error where Zed would not save credentials to the keychain
after signing in.
---
 crates/client/src/client.rs        | 7 ++-----
 crates/live_kit_client/src/prod.rs | 1 +
 crates/util/src/util.rs            | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 0821a8e534d9713b312667dce33eb2c11c93d429..189402308487870bee29da52c9333283ceb7fd1f 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1371,10 +1371,7 @@ fn read_credentials_from_keychain(cx: &AsyncAppContext) -> Option<Credentials> {
     })
 }
 
-async fn write_credentials_to_keychain(
-    credentials: Credentials,
-    cx: &AsyncAppContext,
-) -> Result<()> {
+fn write_credentials_to_keychain(credentials: Credentials, cx: &AsyncAppContext) -> Result<()> {
     cx.update(move |cx| {
         cx.write_credentials(
             &ZED_SERVER_URL,
@@ -1384,7 +1381,7 @@ async fn write_credentials_to_keychain(
     })?
 }
 
-async fn delete_credentials_from_keychain(cx: &AsyncAppContext) -> Result<()> {
+fn delete_credentials_from_keychain(cx: &AsyncAppContext) -> Result<()> {
     cx.update(move |cx| cx.delete_credentials(&ZED_SERVER_URL))?
 }
 
diff --git a/crates/live_kit_client/src/prod.rs b/crates/live_kit_client/src/prod.rs
index 3082c9b5338d7449b00a86fe60287213acd1e79d..f1660cc3d1a7ce9f7951cfd5f1a354158a41d334 100644
--- a/crates/live_kit_client/src/prod.rs
+++ b/crates/live_kit_client/src/prod.rs
@@ -868,6 +868,7 @@ impl Drop for RemoteAudioTrack {
         // the crash in the `livekit.multicast` thread.
         //
         // unsafe { CFRelease(self.native_track.0) }
+        let _ = self.native_track;
     }
 }
 
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index a4031da8cde538eac1833a85d08068488086b9a7..a2f8b87feea91e5ccb09aea4c752cd1c5a583fda 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -244,6 +244,7 @@ where
     }
 }
 
+#[must_use]
 pub struct LogErrorFuture<F>(F, log::Level, core::panic::Location<'static>);
 
 impl<F, T, E> Future for LogErrorFuture<F>