diff --git a/crates/chat_panel/Cargo.toml b/crates/chat_panel/Cargo.toml
index 7f34579c8778969eee5d429d8e165c3437af7082..57220eb5187c324e302884f528f6d8ad2af51db0 100644
--- a/crates/chat_panel/Cargo.toml
+++ b/crates/chat_panel/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "chat_panel"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/chat_panel.rs"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index bfa9731739a7d97245f549c7e8e97192df55169f..4db1685586bc89faecf06a30901271ea432843dd 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "client"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/client.rs"
diff --git a/crates/clock/Cargo.toml b/crates/clock/Cargo.toml
index 7ddb64872a7a83456f88fdbd76c10fcc1a24a77e..0a56d5d7c13ed500e76032a817627373ea3d20fc 100644
--- a/crates/clock/Cargo.toml
+++ b/crates/clock/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "clock"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/clock.rs"
diff --git a/crates/contacts_panel/Cargo.toml b/crates/contacts_panel/Cargo.toml
index 38d0c026093a56e3521b379a513eacd5c6df3be1..fb7fe427f81af2c835a93e590c549cc8c98e9224 100644
--- a/crates/contacts_panel/Cargo.toml
+++ b/crates/contacts_panel/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "contacts_panel"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/contacts_panel.rs"
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
index 521eefb6fc2c80d2d4df30c095e862af35e5a43b..c804d1a127520bab79a96fe2a0b51fc0689f1f81 100644
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "file_finder"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/file_finder.rs"
diff --git a/crates/fsevent/Cargo.toml b/crates/fsevent/Cargo.toml
index f4d1b1d04aebb2257da4727654578045744f5414..c184ef22af2cd8124e53f57a88729feca8416375 100644
--- a/crates/fsevent/Cargo.toml
+++ b/crates/fsevent/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fsevent"
 version = "2.0.2"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/fsevent.rs"
diff --git a/crates/fuzzy/Cargo.toml b/crates/fuzzy/Cargo.toml
index dec485ffe3411740c205fd28ab50062a0fadbfab..e3798874e24ca6406487f33afebc38023710c349 100644
--- a/crates/fuzzy/Cargo.toml
+++ b/crates/fuzzy/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fuzzy"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/fuzzy.rs"
diff --git a/crates/go_to_line/Cargo.toml b/crates/go_to_line/Cargo.toml
index f98b1b2ee031616cae39e6894e94204a68943ff0..789dfaedde70b6f224fbc06cad538d9fdea77d76 100644
--- a/crates/go_to_line/Cargo.toml
+++ b/crates/go_to_line/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "go_to_line"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/go_to_line.rs"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 197a5ca12eb4bd79e86423c78c2107acbe828b09..6d33806f1a06f8687ded64daad336928fb566c4a 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Nathan Sobo <nathansobo@gmail.com>"]
-edition = "2018"
+edition = "2021"
 name = "gpui"
 version = "0.1.0"
 
diff --git a/crates/gpui/grammars/context-predicate/Cargo.toml b/crates/gpui/grammars/context-predicate/Cargo.toml
index 1dea1930fa461cc50f1cad48e5fa44dfcd081570..a3cb19799608e4934a1e0c6895786dc9b4b390f8 100644
--- a/crates/gpui/grammars/context-predicate/Cargo.toml
+++ b/crates/gpui/grammars/context-predicate/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.0.1"
 keywords = ["incremental", "parsing", "context-predicate"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-javascript"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 build = "bindings/rust/build.rs"
 include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
diff --git a/crates/gpui_macros/Cargo.toml b/crates/gpui_macros/Cargo.toml
index 8f1c9faba5c5379d4844cd8995553252714227b7..606f395dee2bc01fe1d19282eb21cebe951bd640 100644
--- a/crates/gpui_macros/Cargo.toml
+++ b/crates/gpui_macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "gpui_macros"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/gpui_macros.rs"
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index 76387182f38509712114da25275dff298e11e3e2..3d453054f84fa354248293702bf5cadcf555e7c6 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "lsp"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/lsp.rs"
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index 983b4b40fe35b9e945c56f62eff9de0d2eb5e5f6..2179fc47e66218e20397cb9c7c0e8662431d2f42 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "project_panel"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/project_panel.rs"
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index c7f701662e99f3a8a7d418c3f587e90d83ae8ecb..0258dde231e028f7d57374144d18b29a8da0676c 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "Shared logic for communication between the Zed app and the zed.dev server"
-edition = "2018"
+edition = "2021"
 name = "rpc"
 version = "0.1.0"
 
@@ -8,7 +8,7 @@ version = "0.1.0"
 path = "src/rpc.rs"
 
 [features]
-test-support = ["gpui"]
+test-support = ["gpui/test-support"]
 
 [dependencies]
 anyhow = "1.0"
@@ -25,7 +25,7 @@ rsa = "0.4"
 serde = { version = "1", features = ["derive"] }
 smol-timeout = "0.6"
 zstd = "0.9"
-gpui = { path = "../gpui", features = ["test-support"], optional = true }
+gpui = { path = "../gpui", optional = true }
 
 [build-dependencies]
 prost-build = "0.8"
diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml
index 5a24560e01e9f3b2c10d3f08893500db0418ac99..c99de584f74ca9cce4a35325530ee3721315be10 100644
--- a/crates/server/Cargo.toml
+++ b/crates/server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Nathan Sobo <nathan@warp.dev>"]
 default-run = "zed-server"
-edition = "2018"
+edition = "2021"
 name = "zed-server"
 version = "0.1.0"
 
diff --git a/crates/sum_tree/Cargo.toml b/crates/sum_tree/Cargo.toml
index 20d652620474913d734882ba7564a594c2f84dcd..04569601a208d047f832e5bd23f07b7e4677af8c 100644
--- a/crates/sum_tree/Cargo.toml
+++ b/crates/sum_tree/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sum_tree"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/sum_tree.rs"
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index 1e5d38f44d3f83365a2458adf7cac791f93b2bf0..3d8c0a50bfd659315fda65919af249a1a75013ee 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "theme"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/theme.rs"
diff --git a/crates/theme_selector/Cargo.toml b/crates/theme_selector/Cargo.toml
index e1b253595fac3f455fa905d0b42f3ee001e802e3..0db49e8c4d7cf5ec6664f62a787e55c5d05e3c8e 100644
--- a/crates/theme_selector/Cargo.toml
+++ b/crates/theme_selector/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "theme_selector"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "src/theme_selector.rs"
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index 4f193a87187c66602eb00b25cc31877c0e9a181d..a8b93adf2d692eaa440be1dc7ba56b7e1db36e60 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "util"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 test-support = ["clock", "rand", "serde_json", "tempdir"]
@@ -15,5 +15,5 @@ rand = { version = "0.8", optional = true }
 surf = "2.2"
 tempdir = { version = "0.3.7", optional = true }
 serde_json = { version = "1.0.64", features = [
-    "preserve_order"
+    "preserve_order",
 ], optional = true }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index d288d2288562730a88fff70fe5337e24b36fb025..21ad632bd2895ab0600a879b1d6834dc17b288d0 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Nathan Sobo <nathansobo@gmail.com>"]
 description = "The fast, collaborative code editor."
-edition = "2018"
+edition = "2021"
 name = "zed"
 version = "0.13.0"