Remove 2 suffix from gpui_macros, fix compile errors in tests

Co-authored-by: Mikayla <[email protected]>
BlatchfordDev · Jan 3, 2024 · 83f4c61 · 83f4c61
1 parent f5ba226
commit 83f4c61
Show file tree

Hide file tree

Showing 29 changed files with 66 additions and 1,665 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,6 +1,3 @@
-[alias]
-xtask = "run --package xtask --"
-
 [build]
 # v0 mangling scheme provides more detailed backtraces around closures
 rustflags = ["-C", "symbol-mangling-version=v0"]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,15 +15,12 @@ members = [
     "crates/collab_ui",
     "crates/collections",
     "crates/command_palette",
-    "crates/component_test",
-    "crates/context_menu",
     "crates/copilot",
     "crates/copilot_button",
     "crates/db",
     "crates/refineable",
     "crates/refineable/derive_refineable",
     "crates/diagnostics",
-    "crates/drag_and_drop",
     "crates/editor",
     "crates/feature_flags",
     "crates/feedback",
@@ -36,7 +33,7 @@ members = [
     "crates/gpui",
     "crates/gpui_macros",
     "crates/gpui",
-    "crates/gpui2_macros",
+    "crates/gpui_macros",
     "crates/install_cli",
     "crates/journal",
     "crates/journal",
@@ -85,7 +82,6 @@ members = [
     "crates/vcs_menu",
     "crates/workspace",
     "crates/welcome",
-    "crates/xtask",
     "crates/zed",
     "crates/zed_actions",
 ]

diff --git a/crates/collab_ui/src/face_pile.rs b/crates/collab_ui/src/face_pile.rs
@@ -1,5 +1,5 @@
 use gpui::{
-    div, AnyElement, ElementId, IntoElement, ParentElement, RenderOnce, Styled, WindowContext,
+    div, AnyElement, IntoElement, ParentElement, RenderOnce, Styled, WindowContext,
 };
 use smallvec::SmallVec;
 

diff --git a/crates/component_test/Cargo.toml b/crates/component_test/Cargo.toml
diff --git a/crates/component_test/src/component_test.rs b/crates/component_test/src/component_test.rs
diff --git a/crates/context_menu/Cargo.toml b/crates/context_menu/Cargo.toml