Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove gpui (1) dependencies from zed2

Browse source 
Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-11-20 10:46:16 -08:00
parent acbad4c7b7
commit babd41916a
6 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -1398,7 +1398,7 @@ dependencies = [
"smol", "smol",
"sum_tree", "sum_tree",
"tempfile", "tempfile",
"text", "text2",
"thiserror", "thiserror",
"time", "time",
"tiny_http", "tiny_http",
@ -1867,7 +1867,7 @@ dependencies = [
"editor2", "editor2",
"feature_flags2", "feature_flags2",
"futures 0.3.28", "futures 0.3.28",
"fuzzy", "fuzzy2",
"gpui2", "gpui2",
"language2", "language2",
"lazy_static", "lazy_static",
@ -6761,7 +6761,6 @@ dependencies = [
"anyhow", "anyhow",
"client2", "client2",
"collections", "collections",
"context_menu",
"db2", "db2",
"editor2", "editor2",
"futures 0.3.28", "futures 0.3.28",
@ -11632,7 +11631,6 @@ dependencies = [
"fs2", "fs2",
"fsevent", "fsevent",
"futures 0.3.28", "futures 0.3.28",
"fuzzy",
"go_to_line2", "go_to_line2",
"gpui2", "gpui2",
"ignore", "ignore",

2
crates/channel2/Cargo.toml
View file

@ -18,7 +18,7 @@ db = { package = "db2", path = "../db2" }
gpui = { package = "gpui2", path = "../gpui2" } gpui = { package = "gpui2", path = "../gpui2" }
util = { path = "../util" } util = { path = "../util" }
rpc = { package = "rpc2", path = "../rpc2" } rpc = { package = "rpc2", path = "../rpc2" }
text = { path = "../text" } text = { package = "text2", path = "../text2" }
language = { package = "language2", path = "../language2" } language = { package = "language2", path = "../language2" }
settings = { package = "settings2", path = "../settings2" } settings = { package = "settings2", path = "../settings2" }
feature_flags = { package = "feature_flags2", path = "../feature_flags2" } feature_flags = { package = "feature_flags2", path = "../feature_flags2" }

2
crates/collab_ui2/Cargo.toml
View file

@ -33,7 +33,7 @@ collections = { path = "../collections" }
# drag_and_drop = { path = "../drag_and_drop" } # drag_and_drop = { path = "../drag_and_drop" }
editor = { package="editor2", path = "../editor2" } editor = { package="editor2", path = "../editor2" }
#feedback = { path = "../feedback" } #feedback = { path = "../feedback" }
fuzzy = { path = "../fuzzy" } fuzzy = { package = "fuzzy2", path = "../fuzzy2" }
gpui = { package = "gpui2", path = "../gpui2" } gpui = { package = "gpui2", path = "../gpui2" }
language = { package = "language2", path = "../language2" } language = { package = "language2", path = "../language2" }
menu = { package = "menu2", path = "../menu2" } menu = { package = "menu2", path = "../menu2" }

1
crates/project_panel2/Cargo.toml
View file

@ -9,7 +9,6 @@ path = "src/project_panel.rs"
doctest = false doctest = false
[dependencies] [dependencies]
context_menu = { path = "../context_menu" }
collections = { path = "../collections" } collections = { path = "../collections" }
db = { path = "../db2", package = "db2" } db = { path = "../db2", package = "db2" }
editor = { path = "../editor2", package = "editor2" } editor = { path = "../editor2", package = "editor2" }

1
crates/project_panel2/src/project_panel.rs
View file

@ -247,7 +247,6 @@ impl ProjectPanel {
let mut old_dock_position = this.position(cx); let mut old_dock_position = this.position(cx);
ProjectPanelSettings::register(cx); ProjectPanelSettings::register(cx);
cx.observe_global::<SettingsStore>(move |this, cx| { cx.observe_global::<SettingsStore>(move |this, cx| {
dbg!("OLA!");
let new_dock_position = this.position(cx); let new_dock_position = this.position(cx);
if new_dock_position != old_dock_position { if new_dock_position != old_dock_position {
old_dock_position = new_dock_position; old_dock_position = new_dock_position;

1
crates/zed2/Cargo.toml
View file

@ -39,7 +39,6 @@ file_finder = { package="file_finder2", path = "../file_finder2" }
# search = { path = "../search" } # search = { path = "../search" }
fs = { package = "fs2", path = "../fs2" } fs = { package = "fs2", path = "../fs2" }
fsevent = { path = "../fsevent" } fsevent = { path = "../fsevent" }
fuzzy = { path = "../fuzzy" }
go_to_line = { package = "go_to_line2", path = "../go_to_line2" } go_to_line = { package = "go_to_line2", path = "../go_to_line2" }
gpui = { package = "gpui2", path = "../gpui2" } gpui = { package = "gpui2", path = "../gpui2" }
install_cli = { package = "install_cli2", path = "../install_cli2" } install_cli = { package = "install_cli2", path = "../install_cli2" }