From 3412bb75bebcc8ec4f77234baa9acca7fb1bc48f Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 6 Oct 2023 13:39:10 -0700 Subject: [PATCH] Remove call -> channel dependency --- Cargo.lock | 1 - crates/call/Cargo.toml | 1 - crates/call/src/call.rs | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b6583f067e7edf81255dc7b892d10afaaf8b937..60d7b0b7d5980b23ab87c4a716eca2825bdb5f54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1082,7 +1082,6 @@ dependencies = [ "anyhow", "async-broadcast", "audio", - "channel", "client", "collections", "fs", diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml index b4e94fe56c3b12533d232eacf30c5edd633d5a03..eb448d8d8d089369c724f49e5911a8946598f8a4 100644 --- a/crates/call/Cargo.toml +++ b/crates/call/Cargo.toml @@ -20,7 +20,6 @@ test-support = [ [dependencies] audio = { path = "../audio" } -channel = { path = "../channel" } client = { path = "../client" } collections = { path = "../collections" } gpui = { path = "../gpui" } diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs index d86ed1be37e38da86bb9715e187528447e5b1abc..08463413257b4b10972ad08ab7c64d181599d914 100644 --- a/crates/call/src/call.rs +++ b/crates/call/src/call.rs @@ -5,7 +5,6 @@ pub mod room; use anyhow::{anyhow, Result}; use audio::Audio; use call_settings::CallSettings; -use channel::ChannelId; use client::{ proto, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore, ZED_ALWAYS_ACTIVE, @@ -79,7 +78,7 @@ impl ActiveCall { } } - pub fn channel_id(&self, cx: &AppContext) -> Option { + pub fn channel_id(&self, cx: &AppContext) -> Option { self.room()?.read(cx).channel_id() }