From 0e55f0ccaa4d0815c0679f7c2e93f588620f961f Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 26 Jan 2022 12:50:31 -0800 Subject: [PATCH] Use Rust 2021 edition in all crates Co-Authored-By: Nathan Sobo --- crates/chat_panel/Cargo.toml | 2 +- crates/client/Cargo.toml | 2 +- crates/clock/Cargo.toml | 2 +- crates/contacts_panel/Cargo.toml | 2 +- crates/file_finder/Cargo.toml | 2 +- crates/fsevent/Cargo.toml | 2 +- crates/fuzzy/Cargo.toml | 2 +- crates/go_to_line/Cargo.toml | 2 +- crates/gpui/Cargo.toml | 2 +- crates/gpui/grammars/context-predicate/Cargo.toml | 2 +- crates/gpui_macros/Cargo.toml | 2 +- crates/lsp/Cargo.toml | 2 +- crates/project_panel/Cargo.toml | 2 +- crates/rpc/Cargo.toml | 6 +++--- crates/server/Cargo.toml | 2 +- crates/sum_tree/Cargo.toml | 2 +- crates/theme/Cargo.toml | 2 +- crates/theme_selector/Cargo.toml | 2 +- crates/util/Cargo.toml | 4 ++-- crates/zed/Cargo.toml | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/crates/chat_panel/Cargo.toml b/crates/chat_panel/Cargo.toml index 7f34579c87..57220eb518 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 bfa9731739..4db1685586 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 7ddb64872a..0a56d5d7c1 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 38d0c02609..fb7fe427f8 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 521eefb6fc..c804d1a127 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 f4d1b1d04a..c184ef22af 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 dec485ffe3..e3798874e2 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 f98b1b2ee0..789dfaedde 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 197a5ca12e..6d33806f1a 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Nathan Sobo "] -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 1dea1930fa..a3cb197996 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 8f1c9faba5..606f395dee 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 76387182f3..3d453054f8 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 983b4b40fe..2179fc47e6 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 c7f701662e..0258dde231 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 5a24560e01..c99de584f7 100644 --- a/crates/server/Cargo.toml +++ b/crates/server/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Nathan Sobo "] 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 20d6526204..04569601a2 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 1e5d38f44d..3d8c0a50bf 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 e1b253595f..0db49e8c4d 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 4f193a8718..a8b93adf2d 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 d288d22885..21ad632bd2 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Nathan Sobo "] description = "The fast, collaborative code editor." -edition = "2018" +edition = "2021" name = "zed" version = "0.13.0"