Stop depending on gpui in client2 and settings2

Antonio Scandurra created 2 years ago

Change summary

Cargo.lock                  | 4 ++--
crates/client2/Cargo.toml   | 2 +-
crates/settings2/Cargo.toml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

Detailed changes

Cargo.lock

@@ -1471,7 +1471,7 @@ dependencies = [
  "async-recursion 0.3.2",
  "async-tungstenite",
  "collections",
- "db",
+ "db2",
  "feature_flags2",
  "futures 0.3.28",
  "gpui2",
@@ -7485,7 +7485,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "collections",
- "feature_flags",
+ "feature_flags2",
  "fs",
  "futures 0.3.28",
  "gpui2",

crates/client2/Cargo.toml

@@ -13,7 +13,7 @@ test-support = ["collections/test-support", "gpui2/test-support", "rpc/test-supp
 
 [dependencies]
 collections = { path = "../collections" }
-db = { path = "../db" }
+db2 = { path = "../db2" }
 gpui2 = { path = "../gpui2" }
 util = { path = "../util" }
 rpc = { path = "../rpc" }

crates/settings2/Cargo.toml

@@ -16,7 +16,7 @@ collections = { path = "../collections" }
 gpui2 = { path = "../gpui2" }
 sqlez = { path = "../sqlez" }
 fs = { path = "../fs" }
-feature_flags = { path = "../feature_flags" }
+feature_flags2 = { path = "../feature_flags2" }
 util = { path = "../util" }
 
 anyhow.workspace = true