From 7763acbdd5a2a7c55d9459b3231f79694e8e1820 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 6 Oct 2022 09:52:03 +0200
Subject: [PATCH] Move `IncomingCall` into `call` crate

---
 crates/call/src/call.rs                            | 10 +++++++++-
 crates/call/src/room.rs                            |  7 +++++--
 crates/client/src/client.rs                        |  1 -
 crates/client/src/incoming_call.rs                 | 10 ----------
 crates/collab_ui/src/incoming_call_notification.rs |  3 +--
 5 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 crates/client/src/incoming_call.rs

diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs
index 607931fdc4710ee40aca8931a5078c7574227d59..7cd8896bf6ee5568f7acf0deea1d80a201b1c6bc 100644
--- a/crates/call/src/call.rs
+++ b/crates/call/src/call.rs
@@ -2,7 +2,7 @@ mod participant;
 pub mod room;
 
 use anyhow::{anyhow, Result};
-use client::{incoming_call::IncomingCall, proto, Client, TypedEnvelope, UserStore};
+use client::{proto, Client, TypedEnvelope, User, UserStore};
 use gpui::{
     AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext,
     Subscription, Task,
@@ -18,6 +18,14 @@ pub fn init(client: Arc<Client>, user_store: ModelHandle<UserStore>, cx: &mut Mu
     cx.set_global(active_call);
 }
 
+#[derive(Clone)]
+pub struct IncomingCall {
+    pub room_id: u64,
+    pub caller: Arc<User>,
+    pub participants: Vec<Arc<User>>,
+    pub initial_project_id: Option<u64>,
+}
+
 pub struct ActiveCall {
     room: Option<(ModelHandle<Room>, Vec<Subscription>)>,
     incoming_call: (
diff --git a/crates/call/src/room.rs b/crates/call/src/room.rs
index 52f283dd03ecbef82e5cc90a7c900e88aac87272..3d8697f1e0f1e7ebb7c4d03cbfb0c4e900daa58f 100644
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@@ -1,6 +1,9 @@
-use crate::participant::{ParticipantLocation, RemoteParticipant};
+use crate::{
+    participant::{ParticipantLocation, RemoteParticipant},
+    IncomingCall,
+};
 use anyhow::{anyhow, Result};
-use client::{incoming_call::IncomingCall, proto, Client, PeerId, TypedEnvelope, User, UserStore};
+use client::{proto, Client, PeerId, TypedEnvelope, User, UserStore};
 use collections::{HashMap, HashSet};
 use futures::StreamExt;
 use gpui::{AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext, Task};
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 9c5b8e35c9c9f83dd389b628e767c5d23a9cd502..a762e263ea55d790bfbfa1c4af7bd4baad8b6f00 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -3,7 +3,6 @@ pub mod test;
 
 pub mod channel;
 pub mod http;
-pub mod incoming_call;
 pub mod user;
 
 use anyhow::{anyhow, Context, Result};
diff --git a/crates/client/src/incoming_call.rs b/crates/client/src/incoming_call.rs
deleted file mode 100644
index 80ba014061f97c2f44e5887f883b4dd34335e629..0000000000000000000000000000000000000000
--- a/crates/client/src/incoming_call.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use crate::User;
-use std::sync::Arc;
-
-#[derive(Clone)]
-pub struct IncomingCall {
-    pub room_id: u64,
-    pub caller: Arc<User>,
-    pub participants: Vec<Arc<User>>,
-    pub initial_project_id: Option<u64>,
-}
diff --git a/crates/collab_ui/src/incoming_call_notification.rs b/crates/collab_ui/src/incoming_call_notification.rs
index ae1240d0d9feef84b5e79d328e9569ed3030108b..8860097a592f9af87ec136d25f6f756e827fd5bc 100644
--- a/crates/collab_ui/src/incoming_call_notification.rs
+++ b/crates/collab_ui/src/incoming_call_notification.rs
@@ -1,5 +1,4 @@
-use call::ActiveCall;
-use client::incoming_call::IncomingCall;
+use call::{ActiveCall, IncomingCall};
 use futures::StreamExt;
 use gpui::{
     elements::*,