Rename room crate to call

Also, rename `client::Call` to `client::IncomingCall`.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-09-29 17:24:31 +02:00
parent 1158911560
commit e0db62173a
13 changed files with 49 additions and 43 deletions

View file

@ -9,18 +9,19 @@ doctest = false
[features]
test-support = [
"call/test-support",
"client/test-support",
"collections/test-support",
"editor/test-support",
"gpui/test-support",
"project/test-support",
"room/test-support",
"settings/test-support",
"util/test-support",
"workspace/test-support",
]
[dependencies]
call = { path = "../call" }
client = { path = "../client" }
clock = { path = "../clock" }
collections = { path = "../collections" }
@ -29,7 +30,6 @@ fuzzy = { path = "../fuzzy" }
gpui = { path = "../gpui" }
menu = { path = "../menu" }
project = { path = "../project" }
room = { path = "../room" }
settings = { path = "../settings" }
theme = { path = "../theme" }
util = { path = "../util" }
@ -41,12 +41,12 @@ postage = { version = "0.4.1", features = ["futures-traits"] }
serde = { version = "1.0", features = ["derive", "rc"] }
[dev-dependencies]
call = { path = "../call", features = ["test-support"] }
client = { path = "../client", features = ["test-support"] }
collections = { path = "../collections", features = ["test-support"] }
editor = { path = "../editor", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] }
project = { path = "../project", features = ["test-support"] }
room = { path = "../room", features = ["test-support"] }
settings = { path = "../settings", features = ["test-support"] }
util = { path = "../util", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] }

View file

@ -1,5 +1,6 @@
use std::sync::Arc;
use call::ActiveCall;
use client::{Client, Contact, User, UserStore};
use editor::{Cancel, Editor};
use fuzzy::{match_strings, StringMatchCandidate};
@ -9,7 +10,6 @@ use gpui::{
ViewHandle,
};
use menu::{Confirm, SelectNext, SelectPrev};
use room::ActiveCall;
use settings::Settings;
use theme::IconButton;

View file

@ -1,6 +1,7 @@
use std::sync::Arc;
use client::{call::Call, Client, UserStore};
use call::ActiveCall;
use client::{incoming_call::IncomingCall, Client, UserStore};
use futures::StreamExt;
use gpui::{
elements::*,
@ -8,7 +9,6 @@ use gpui::{
impl_internal_actions, Entity, ModelHandle, MouseButton, MutableAppContext, RenderContext,
View, ViewContext, WindowBounds, WindowKind, WindowOptions,
};
use room::ActiveCall;
use settings::Settings;
use util::ResultExt;
@ -55,13 +55,17 @@ struct RespondToCall {
}
pub struct IncomingCallNotification {
call: Call,
call: IncomingCall,
client: Arc<Client>,
user_store: ModelHandle<UserStore>,
}
impl IncomingCallNotification {
pub fn new(call: Call, client: Arc<Client>, user_store: ModelHandle<UserStore>) -> Self {
pub fn new(
call: IncomingCall,
client: Arc<Client>,
user_store: ModelHandle<UserStore>,
) -> Self {
Self {
call,
client,