Skip to content

Commit

Permalink
Remove 2 suffix for workspace
Browse files Browse the repository at this point in the history
Co-authored-by: Mikayla <mikayla@zed.dev>
  • Loading branch information
maxbrunsfeld and mikayla-maki committed Jan 3, 2024
1 parent 492805a commit 789ce8d
Show file tree
Hide file tree
Showing 66 changed files with 4,778 additions and 19,041 deletions.
100 changes: 30 additions & 70 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ members = [
"crates/story",
"crates/vim",
"crates/vcs_menu",
"crates/workspace2",
"crates/workspace",
"crates/welcome",
"crates/xtask",
"crates/zed",
Expand Down
2 changes: 1 addition & 1 deletion crates/activity_indicator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ settings = { path = "../settings2", package = "settings2" }
ui = { path = "../ui2", package = "ui2" }
util = { path = "../util" }
theme = { path = "../theme2", package = "theme2" }
workspace = { path = "../workspace2", package = "workspace2" }
workspace = { path = "../workspace", package = "workspace" }

anyhow.workspace = true
futures.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/assistant2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ settings = { package = "settings2", path = "../settings2" }
theme = { package = "theme2", path = "../theme2" }
ui = { package = "ui2", path = "../ui2" }
util = { path = "../util" }
workspace = { package = "workspace2", path = "../workspace2" }
workspace = { path = "../workspace" }

uuid.workspace = true
log.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/auto_update/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ menu = { package = "menu2", path = "../menu2" }
project = { package = "project2", path = "../project2" }
settings = { package = "settings2", path = "../settings2" }
theme = { package = "theme2", path = "../theme2" }
workspace = { package = "workspace2", path = "../workspace2" }
workspace = { path = "../workspace" }
util = { path = "../util" }
anyhow.workspace = true
isahc.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/breadcrumbs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ project = { package = "project2", path = "../project2" }
search = { path = "../search" }
settings = { package = "settings2", path = "../settings2" }
theme = { package = "theme2", path = "../theme2" }
workspace = { package = "workspace2", path = "../workspace2" }
workspace = { path = "../workspace" }
outline = { path = "../outline" }
itertools = "0.10"

[dev-dependencies]
editor = { path = "../editor", features = ["test-support"] }
gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
workspace = { package = "workspace2", path = "../workspace2", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] }
2 changes: 1 addition & 1 deletion crates/collab2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ project = { package = "project2", path = "../project2", features = ["test-suppor
rpc = { package = "rpc2", path = "../rpc2", features = ["test-support"] }
settings = { package = "settings2", path = "../settings2", features = ["test-support"] }
theme = { package = "theme2", path = "../theme2" }
workspace = { package = "workspace2", path = "../workspace2", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] }

collab_ui = { path = "../collab_ui", features = ["test-support"] }

Expand Down
4 changes: 2 additions & 2 deletions crates/collab_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ theme_selector = { path = "../theme_selector" }
vcs_menu = { path = "../vcs_menu" }
ui = { package = "ui2", path = "../ui2" }
util = { path = "../util" }
workspace = { package = "workspace2", path = "../workspace2" }
workspace = { path = "../workspace" }
zed-actions = { package="zed_actions2", path = "../zed_actions2"}

anyhow.workspace = true
Expand All @@ -75,7 +75,7 @@ project = { package = "project2", path = "../project2", features = ["test-suppor
rpc = { package = "rpc2", path = "../rpc2", features = ["test-support"] }
settings = { package = "settings2", path = "../settings2", features = ["test-support"] }
util = { path = "../util", features = ["test-support"] }
workspace = { package = "workspace2", path = "../workspace2", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] }

pretty_assertions.workspace = true
tree-sitter-markdown.workspace = true
Loading

0 comments on commit 789ce8d

Please sign in to comment.