Merge branch 'zed2' of github.com:zed-industries/zed into zed2

2023-10-25 20:38:03 +02:00
parent e67048ee7b 5ba04dce2b
commit b5eae86b67
16 changed files with 1931 additions and 120 deletions
@@ -1471,7 +1471,7 @@ dependencies = [
 "async-recursion 0.3.2",
 "async-tungstenite",
 "collections",
- "db",
+ "db2",
 "feature_flags2",
 "futures 0.3.28",
 "gpui2",
@@ -2991,6 +2991,35 @@ dependencies = [
 "winapi 0.3.9",
 ]

+[[package]]
+name = "fs2"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "collections",
+ "fsevent",
+ "futures 0.3.28",
+ "git2",
+ "gpui2",
+ "lazy_static",
+ "libc",
+ "log",
+ "parking_lot 0.11.2",
+ "rand 0.8.5",
+ "regex",
+ "rope",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "smol",
+ "sum_tree",
+ "tempfile",
+ "text",
+ "time",
+ "util",
+]
+
 [[package]]
 name = "fsevent"
 version = "2.0.2"
@@ -7485,7 +7514,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
- "feature_flags",
+ "feature_flags2",
 "fs",
 "futures 0.3.28",
 "gpui2",