From 7c10faeccf9cb1f07c0ad2018e8035ce7d96286e Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 21 Sep 2021 17:21:30 +0200
Subject: [PATCH] Use more concrete names for `Store` return values

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 server/src/rpc/store.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/src/rpc/store.rs b/server/src/rpc/store.rs
index 8496dbefce..15d2e6a920 100644
--- a/server/src/rpc/store.rs
+++ b/server/src/rpc/store.rs
@@ -52,7 +52,12 @@ pub struct JoinedWorktree<'a> {
     pub worktree: &'a Worktree,
 }
 
-pub struct WorktreeMetadata {
+pub struct UnsharedWorktree {
+    pub connection_ids: Vec<ConnectionId>,
+    pub collaborator_ids: Vec<UserId>,
+}
+
+pub struct LeftWorktree {
     pub connection_ids: Vec<ConnectionId>,
     pub collaborator_ids: Vec<UserId>,
 }
@@ -291,7 +296,7 @@ impl Store {
         &mut self,
         worktree_id: u64,
         acting_connection_id: ConnectionId,
-    ) -> tide::Result<WorktreeMetadata> {
+    ) -> tide::Result<UnsharedWorktree> {
         let worktree = if let Some(worktree) = self.worktrees.get_mut(&worktree_id) {
             worktree
         } else {
@@ -310,7 +315,7 @@ impl Store {
                     connection.worktrees.remove(&worktree_id);
                 }
             }
-            Ok(WorktreeMetadata {
+            Ok(UnsharedWorktree {
                 connection_ids,
                 collaborator_ids: worktree.collaborator_user_ids.clone(),
             })
@@ -360,12 +365,12 @@ impl Store {
         &mut self,
         connection_id: ConnectionId,
         worktree_id: u64,
-    ) -> Option<WorktreeMetadata> {
+    ) -> Option<LeftWorktree> {
         let worktree = self.worktrees.get_mut(&worktree_id)?;
         let share = worktree.share.as_mut()?;
         let replica_id = share.guest_connection_ids.remove(&connection_id)?;
         share.active_replica_ids.remove(&replica_id);
-        Some(WorktreeMetadata {
+        Some(LeftWorktree {
             connection_ids: worktree.connection_ids(),
             collaborator_ids: worktree.collaborator_user_ids.clone(),
         })