From 6c3551bff1066fa6b3ee5be466dea0b8d3f2ccfd Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 8 Sep 2021 17:09:02 +0200
Subject: [PATCH] Use `watch::Sender::borrow_mut` instead of `send`

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 zed/src/chat_panel.rs |  6 +++---
 zed/src/rpc.rs        | 21 ++++++++-------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/zed/src/chat_panel.rs b/zed/src/chat_panel.rs
index ab38f64169731975c598dbac8975435a8b2520c9..a4b7eb5938d48a523638abc9973e2cea19b5755e 100644
--- a/zed/src/chat_panel.rs
+++ b/zed/src/chat_panel.rs
@@ -31,7 +31,7 @@ pub struct ChatPanel {
     channel_select: ViewHandle<Select>,
     settings: watch::Receiver<Settings>,
     local_timezone: UtcOffset,
-    _status_observer: Task<()>,
+    _observe_status: Task<()>,
 }
 
 pub enum Event {}
@@ -99,7 +99,7 @@ impl ChatPanel {
                 cx.dispatch_action(LoadMoreMessages);
             }
         });
-        let _status_observer = cx.spawn(|this, mut cx| {
+        let _observe_status = cx.spawn(|this, mut cx| {
             let mut status = rpc.status();
             async move {
                 while let Some(_) = status.recv().await {
@@ -117,7 +117,7 @@ impl ChatPanel {
             channel_select,
             settings,
             local_timezone: cx.platform().local_timezone(),
-            _status_observer,
+            _observe_status,
         };
 
         this.init_active_channel(cx);
diff --git a/zed/src/rpc.rs b/zed/src/rpc.rs
index 4daff984e89b3dc0228dcc8352024fbed26d4f8d..0427e3ad92fd6f112a784e14210a55a0f9e0ecd6 100644
--- a/zed/src/rpc.rs
+++ b/zed/src/rpc.rs
@@ -6,7 +6,6 @@ use gpui::{AsyncAppContext, Entity, ModelContext, Task};
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
 use postage::prelude::Stream;
-use postage::sink::Sink;
 use postage::watch;
 use std::any::TypeId;
 use std::collections::HashMap;
@@ -94,10 +93,9 @@ impl Client {
         self.state.read().status.1.clone()
     }
 
-    async fn set_status(&self, status: Status) -> Result<()> {
+    fn set_status(&self, status: Status) {
         let mut state = self.state.write();
-        state.status.0.send(status).await?;
-        Ok(())
+        *state.status.0.borrow_mut() = status;
     }
 
     pub fn subscribe_from_model<T, M, F>(
@@ -167,14 +165,14 @@ impl Client {
         let (user_id, access_token) = Self::login(cx.platform(), &cx.background()).await?;
         let user_id = user_id.parse::<u64>()?;
 
-        self.set_status(Status::Connecting).await?;
+        self.set_status(Status::Connecting);
         match self.connect(user_id, &access_token, cx).await {
             Ok(()) => {
                 log::info!("connected to rpc address {}", *ZED_SERVER_URL);
                 Ok(())
             }
             Err(err) => {
-                self.set_status(Status::ConnectionError).await?;
+                self.set_status(Status::ConnectionError);
                 Err(err)
             }
         }
@@ -259,20 +257,17 @@ impl Client {
         self.set_status(Status::Connected {
             connection_id,
             user_id,
-        })
-        .await?;
+        });
 
         let handle_io = cx.background().spawn(handle_io);
         let this = self.clone();
         cx.foreground()
             .spawn(async move {
                 match handle_io.await {
-                    Ok(()) => {
-                        let _ = this.set_status(Status::Disconnected).await;
-                    }
+                    Ok(()) => this.set_status(Status::Disconnected),
                     Err(err) => {
                         log::error!("connection error: {:?}", err);
-                        let _ = this.set_status(Status::ConnectionLost).await;
+                        this.set_status(Status::ConnectionLost);
                     }
                 }
             })
@@ -365,7 +360,7 @@ impl Client {
     pub async fn disconnect(&self) -> Result<()> {
         let conn_id = self.connection_id()?;
         self.peer.disconnect(conn_id).await;
-        self.set_status(Status::Disconnected).await?;
+        self.set_status(Status::Disconnected);
         Ok(())
     }