diff --git a/Cargo.lock b/Cargo.lock index 8abf344886..dbda06f25d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12813,21 +12813,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vcs_menu" -version = "0.1.0" -dependencies = [ - "anyhow", - "fuzzy", - "git", - "gpui", - "picker", - "project", - "ui", - "util", - "workspace", -] - [[package]] name = "version-compare" version = "0.2.0" @@ -14767,7 +14752,6 @@ dependencies = [ "unindent", "util", "uuid", - "vcs_menu", "wasmtime-wasi", "workspace", "worktree", diff --git a/Cargo.toml b/Cargo.toml index cbdf52ad6d..ca733484a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -99,7 +99,6 @@ members = [ "crates/ui_macros", "crates/reqwest_client", "crates/util", - "crates/vcs_menu", "crates/workspace", "crates/worktree", "crates/zed", @@ -246,7 +245,6 @@ ui = { path = "crates/ui" } ui_input = { path = "crates/ui_input" } ui_macros = { path = "crates/ui_macros" } util = { path = "crates/util" } -vcs_menu = { path = "crates/vcs_menu" } workspace = { path = "crates/workspace" } worktree = { path = "crates/worktree" } zed = { path = "crates/zed" } diff --git a/crates/vcs_menu/Cargo.toml b/crates/vcs_menu/Cargo.toml deleted file mode 100644 index 11de371868..0000000000 --- a/crates/vcs_menu/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "vcs_menu" -version = "0.1.0" -edition = "2021" -publish = false -license = "GPL-3.0-or-later" - -[lints] -workspace = true - -[dependencies] -anyhow.workspace = true -fuzzy.workspace = true -git.workspace = true -gpui.workspace = true -picker.workspace = true -project.workspace = true -ui.workspace = true -util.workspace = true -workspace.workspace = true diff --git a/crates/vcs_menu/LICENSE-GPL b/crates/vcs_menu/LICENSE-GPL deleted file mode 120000 index 89e542f750..0000000000 --- a/crates/vcs_menu/LICENSE-GPL +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-GPL \ No newline at end of file diff --git a/crates/zed_common/Cargo.toml b/crates/zed_common/Cargo.toml index 3f7451dfda..0d6bb19f20 100644 --- a/crates/zed_common/Cargo.toml +++ b/crates/zed_common/Cargo.toml @@ -140,7 +140,6 @@ ui.workspace = true unindent.workspace = true util.workspace = true uuid.workspace = true -vcs_menu.workspace = true wasmtime-wasi.workspace = true workspace.workspace = true worktree.workspace = true diff --git a/crates/zed_common/src/collab_ui/mod.rs b/crates/zed_common/src/collab_ui/mod.rs index 01f0ecfe72..b4d7b872d5 100644 --- a/crates/zed_common/src/collab_ui/mod.rs +++ b/crates/zed_common/src/collab_ui/mod.rs @@ -33,7 +33,7 @@ pub fn init(app_state: &Arc, cx: &mut AppContext) { notification_panel::init(cx); notifications::init(app_state, cx); crate::title_bar::init(cx); - vcs_menu::init(cx); + crate::vcs_menu::init(cx); } fn notification_window_options( diff --git a/crates/zed_common/src/lib.rs b/crates/zed_common/src/lib.rs index aaf89eca1b..c53c8be35e 100644 --- a/crates/zed_common/src/lib.rs +++ b/crates/zed_common/src/lib.rs @@ -23,5 +23,6 @@ pub mod terminal_view; pub mod theme_selector; pub mod title_bar; pub mod toolchain_selector; +pub mod vcs_menu; pub mod vim; pub mod welcome; diff --git a/crates/zed_common/src/title_bar/mod.rs b/crates/zed_common/src/title_bar/mod.rs index 6530221839..dfd828f3c5 100644 --- a/crates/zed_common/src/title_bar/mod.rs +++ b/crates/zed_common/src/title_bar/mod.rs @@ -9,6 +9,7 @@ mod stories; use crate::recent_projects::{OpenRemote, RecentProjects}; use crate::title_bar::application_menu::ApplicationMenu; use crate::title_bar::platforms::{platform_linux, platform_mac, platform_windows}; +use crate::vcs_menu::{BranchList, OpenRecent as ToggleVcsMenu}; use auto_update::AutoUpdateStatus; use call::ActiveCall; use client::{Client, UserStore}; @@ -28,7 +29,6 @@ use ui::{ IconSize, IconWithIndicator, Indicator, PopoverMenu, Tooltip, }; use util::ResultExt; -use vcs_menu::{BranchList, OpenRecent as ToggleVcsMenu}; use workspace::{notifications::NotifyResultExt, Workspace}; #[cfg(feature = "stories")] diff --git a/crates/vcs_menu/src/lib.rs b/crates/zed_common/src/vcs_menu/mod.rs similarity index 100% rename from crates/vcs_menu/src/lib.rs rename to crates/zed_common/src/vcs_menu/mod.rs