Skip to content

Commit

Permalink
collab_ui: Remove dependency on vcs_menu (zed-industries#21016)
Browse files Browse the repository at this point in the history
This PR removes the `vcs_menu` dependency from `collab_ui`.

We were only depending on this to call `vcs_menu::init`, which isn't
necessary to do here.

Release Notes:

- N/A
  • Loading branch information
maxdeviant authored Nov 21, 2024
1 parent 2868b67 commit 790fdcf
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions crates/collab_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,11 @@ settings.workspace = true
smallvec.workspace = true
story = { workspace = true, optional = true }
theme.workspace = true
time_format.workspace = true
time.workspace = true
time_format.workspace = true
title_bar.workspace = true
ui.workspace = true
util.workspace = true
vcs_menu.workspace = true
workspace.workspace = true

[dev-dependencies]
Expand Down
1 change: 0 additions & 1 deletion crates/collab_ui/src/collab_ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
notification_panel::init(cx);
notifications::init(app_state, cx);
title_bar::init(cx);
vcs_menu::init(cx);
}

fn notification_window_options(
Expand Down
5 changes: 3 additions & 2 deletions crates/zed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ name = "zed"
path = "src/main.rs"

[dependencies]
assistant_slash_command.workspace = true
activity_indicator.workspace = true
anyhow.workspace = true
assets.workspace = true
assistant.workspace = true
assistant_slash_command.workspace = true
async-watch.workspace = true
audio.workspace = true
auto_update.workspace = true
Expand Down Expand Up @@ -88,6 +88,7 @@ recent_projects.workspace = true
release_channel.workspace = true
remote.workspace = true
repl.workspace = true
reqwest_client.workspace = true
rope.workspace = true
search.workspace = true
serde.workspace = true
Expand All @@ -112,11 +113,11 @@ theme_selector.workspace = true
time.workspace = true
toolchain_selector.workspace = true
ui.workspace = true
reqwest_client.workspace = true
url.workspace = true
urlencoding = "2.1.2"
util.workspace = true
uuid.workspace = true
vcs_menu.workspace = true
vim.workspace = true
welcome.workspace = true
workspace.workspace = true
Expand Down
1 change: 1 addition & 0 deletions crates/zed/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ fn main() {
call::init(app_state.client.clone(), app_state.user_store.clone(), cx);
notifications::init(app_state.client.clone(), app_state.user_store.clone(), cx);
collab_ui::init(&app_state, cx);
vcs_menu::init(cx);
feedback::init(cx);
markdown_preview::init(cx);
welcome::init(cx);
Expand Down

0 comments on commit 790fdcf

Please sign in to comment.