From 790fdcf737e8103140e654be8162c3f0c48f587c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 21 Nov 2024 15:48:35 -0500
Subject: [PATCH] collab_ui: Remove dependency on `vcs_menu` (#21016)

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
---
 Cargo.lock                        | 2 +-
 crates/collab_ui/Cargo.toml       | 3 +--
 crates/collab_ui/src/collab_ui.rs | 1 -
 crates/zed/Cargo.toml             | 5 +++--
 crates/zed/src/main.rs            | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9ddbe6dfaa782b15f4f1a293133a0aa527a8bb50..07af53a6c50137253766bf7c88e88bfee7243d68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2712,7 +2712,6 @@ dependencies = [
  "tree-sitter-md",
  "ui",
  "util",
- "vcs_menu",
  "workspace",
 ]
 
@@ -15574,6 +15573,7 @@ dependencies = [
  "urlencoding",
  "util",
  "uuid",
+ "vcs_menu",
  "vim",
  "welcome",
  "windows 0.58.0",
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index cd00e13206f65696550174114509056d5346c3c7..3cc8f25b18a45ec1ec86acdfb583a2cfbb28cc0e 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -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]
diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
index 2baaa01490e3ed47581bd7a14111a000c1d08db9..67c4ad6dad8474b991430d3ec8253bd607032382 100644
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -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(
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index b55ebce2b92713b17dfd561ac6def80488daa41d..0eef53bd9e783687e63b90ff0df109b73d6c7ed0 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -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
@@ -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
@@ -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
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index f7aabb2626916a71efc83d1f11f271465ad8e34d..b1b721c7c649d2a5de3deaf5e419849fd688412e 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -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);