From 9986e526e51d0b80987c37071286aa587660cea8 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 25 Oct 2023 18:47:03 +0200
Subject: [PATCH] Stop depending on gpui in client2 and settings2

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

diff --git a/Cargo.lock b/Cargo.lock
index 270f2971a8acdec1fe2105d429309a064b7435c1..64be6dc7ad45128a796ff69f78841d49bb79256d 100644
--- a/Cargo.lock
+++ b/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",
diff --git a/crates/client2/Cargo.toml b/crates/client2/Cargo.toml
index 8e892ea298285530e3c56cbb12071299bafcd1f1..3203b718191a6b28701779793a2e87a2f6243fd0 100644
--- a/crates/client2/Cargo.toml
+++ b/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" }
diff --git a/crates/settings2/Cargo.toml b/crates/settings2/Cargo.toml
index b3df9b9e93be20edeaab03c39457bf6b3d57309b..6afb29f647658377ef6157176699a86105809527 100644
--- a/crates/settings2/Cargo.toml
+++ b/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