Merge remote-tracking branch 'origin/main' into zed2-workspace

2023-11-02 13:16:24 -06:00
parent 9c8220d04e 85f0959548
commit 269a72464d
128 changed files with 1718 additions and 1670 deletions
@@ -1541,7 +1541,6 @@ dependencies = [
 "schemars",
 "serde",
 "serde_derive",
- "settings",
 "settings2",
 "smol",
 "sum_tree",
@@ -7796,7 +7795,6 @@ dependencies = [
 "anyhow",
 "collections",
 "feature_flags2",
- "fs",
 "fs2",
 "futures 0.3.28",
 "gpui2",