Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove call -> channel dependency

Browse source
This commit is contained in:
Max Brunsfeld 2023-10-06 13:39:10 -07:00
parent 17925ed563
commit 3412bb75be
3 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1082,7 +1082,6 @@ dependencies = [
"anyhow", "anyhow",
"async-broadcast", "async-broadcast",
"audio", "audio",
"channel",
"client", "client",
"collections", "collections",
"fs", "fs",

1
crates/call/Cargo.toml
View file

@ -20,7 +20,6 @@ test-support = [
[dependencies] [dependencies]
audio = { path = "../audio" } audio = { path = "../audio" }
channel = { path = "../channel" }
client = { path = "../client" } client = { path = "../client" }
collections = { path = "../collections" } collections = { path = "../collections" }
gpui = { path = "../gpui" } gpui = { path = "../gpui" }

3
crates/call/src/call.rs
View file

@ -5,7 +5,6 @@ pub mod room;
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use audio::Audio; use audio::Audio;
use call_settings::CallSettings; use call_settings::CallSettings;
use channel::ChannelId;
use client::{ use client::{
proto, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore, proto, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore,
ZED_ALWAYS_ACTIVE, ZED_ALWAYS_ACTIVE,
@ -79,7 +78,7 @@ impl ActiveCall {
} }
} }
pub fn channel_id(&self, cx: &AppContext) -> Option<ChannelId> { pub fn channel_id(&self, cx: &AppContext) -> Option<u64> {
self.room()?.read(cx).channel_id() self.room()?.read(cx).channel_id()
} }