From 54712170891ea3d6841b4906bc329267406b5def Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 23 Mar 2023 10:29:25 +0100 Subject: [PATCH] Use the same serde version across the entire workspace --- Cargo.lock | 2 ++ crates/auto_update/Cargo.toml | 6 +++--- crates/cli/Cargo.toml | 4 ++-- crates/client/Cargo.toml | 4 ++-- crates/collab/Cargo.toml | 8 ++++---- crates/collab_ui/Cargo.toml | 4 ++-- crates/command_palette/Cargo.toml | 2 +- crates/copilot/Cargo.toml | 2 ++ crates/db/Cargo.toml | 4 ++-- crates/diagnostics/Cargo.toml | 2 +- crates/editor/Cargo.toml | 2 +- crates/feedback/Cargo.toml | 4 ++-- crates/file_finder/Cargo.toml | 2 +- crates/fs/Cargo.toml | 2 +- crates/gpui/Cargo.toml | 6 +++--- crates/language/Cargo.toml | 6 +++--- crates/live_kit_client/Cargo.toml | 10 +++++----- crates/live_kit_server/Cargo.toml | 4 ++-- crates/lsp/Cargo.toml | 6 +++--- crates/picker/Cargo.toml | 2 +- crates/plugin/Cargo.toml | 4 ++-- crates/plugin_macros/Cargo.toml | 4 ++-- crates/plugin_runtime/Cargo.toml | 6 +++--- crates/project/Cargo.toml | 6 +++--- crates/project_panel/Cargo.toml | 2 +- crates/rpc/Cargo.toml | 4 ++-- crates/search/Cargo.toml | 6 +++--- crates/settings/Cargo.toml | 2 +- crates/terminal/Cargo.toml | 4 ++-- crates/terminal_view/Cargo.toml | 4 ++-- crates/theme/Cargo.toml | 6 +++--- crates/util/Cargo.toml | 4 ++-- crates/vim/Cargo.toml | 6 +++--- crates/workspace/Cargo.toml | 6 +++--- crates/zed/Cargo.toml | 8 ++++---- plugins/json_language/Cargo.toml | 2 +- 36 files changed, 80 insertions(+), 76 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e1f5a807c..028e20d984 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1341,6 +1341,8 @@ dependencies = [ "futures 0.3.25", "gpui", "lsp", + "serde", + "serde_derive", "settings", "smol", "util", diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml index 8edb1957af..6b11f5ddbc 100644 --- a/crates/auto_update/Cargo.toml +++ b/crates/auto_update/Cargo.toml @@ -22,8 +22,8 @@ anyhow = "1.0.38" isahc = "1.7" lazy_static = "1.4" log = "0.4" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } smol = "1.2.5" tempdir = "0.3.7" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index bf2e583d2c..6b814941b8 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -17,8 +17,8 @@ anyhow = "1.0" clap = { version = "3.1", features = ["derive"] } dirs = "3.0" ipc-channel = "0.16" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.9" diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 9c772f519b..c75adf5bfa 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -34,8 +34,8 @@ time = { version = "0.3", features = ["serde", "serde-well-known"] } tiny_http = "0.8" uuid = { version = "1.1.2", features = ["v4"] } url = "2.2" -serde = { version = "*", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } settings = { path = "../settings" } tempfile = "3" diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index 2ee93f1a86..b85d999298 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -41,9 +41,9 @@ scrypt = "0.7" # Remove fork dependency when a version with https://github.com/SeaQL/sea-orm/pull/1283 is released. sea-orm = { git = "https://github.com/zed-industries/sea-orm", rev = "18f4c691085712ad014a51792af75a9044bacee6", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls"] } sea-query = "0.27" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = "1.0" +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } sha-1 = "0.9" sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] } time = { version = "0.3", features = ["serde", "serde-well-known"] } @@ -79,7 +79,7 @@ env_logger = "0.9" util = { path = "../util" } lazy_static = "1.4" sea-orm = { git = "https://github.com/zed-industries/sea-orm", rev = "18f4c691085712ad014a51792af75a9044bacee6", features = ["sqlx-sqlite"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } sqlx = { version = "0.6", features = ["sqlite"] } unindent = "0.1" diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml index 516a1b4fe4..50f81c335c 100644 --- a/crates/collab_ui/Cargo.toml +++ b/crates/collab_ui/Cargo.toml @@ -43,8 +43,8 @@ anyhow = "1.0" futures = "0.3" log = "0.4" postage = { workspace = true } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } [dev-dependencies] call = { path = "../call", features = ["test-support"] } diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml index 555deff1ce..6965a3f183 100644 --- a/crates/command_palette/Cargo.toml +++ b/crates/command_palette/Cargo.toml @@ -24,7 +24,7 @@ workspace = { path = "../workspace" } gpui = { path = "../gpui", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } project = { path = "../project", features = ["test-support"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" env_logger = "0.9" diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml index bd79d053d1..4e1339ee50 100644 --- a/crates/copilot/Cargo.toml +++ b/crates/copilot/Cargo.toml @@ -17,5 +17,7 @@ client = { path = "../client" } workspace = { path = "../workspace" } async-compression = { version = "0.3", features = ["gzip", "futures-bufread"] } anyhow = "1.0" +serde = { workspace = true } +serde_derive = { workspace = true } smol = "1.2.5" futures = "0.3" diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml index 16ec37019a..767bf57ba9 100644 --- a/crates/db/Cargo.toml +++ b/crates/db/Cargo.toml @@ -23,8 +23,8 @@ async-trait = "0.1" lazy_static = "1.4.0" log = { version = "0.4.16", features = ["kv_unstable_serde"] } parking_lot = "0.11.1" -serde = { version = "1.0", features = ["derive"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } smol = "1.2" [dev-dependencies] diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml index e28a378a67..8ef2546b5d 100644 --- a/crates/diagnostics/Cargo.toml +++ b/crates/diagnostics/Cargo.toml @@ -29,4 +29,4 @@ editor = { path = "../editor", features = ["test-support"] } language = { path = "../language", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] } -serde_json = { version = "1", features = ["preserve_order"] } +serde_json = { workspace = true } diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml index 44d0936808..5bbd72745d 100644 --- a/crates/editor/Cargo.toml +++ b/crates/editor/Cargo.toml @@ -54,7 +54,7 @@ parking_lot = "0.11" postage = { workspace = true } rand = { version = "0.8.3", optional = true } serde = { workspace = true } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde_derive = { workspace = true } smallvec = { version = "1.6", features = ["union"] } smol = "1.2" tree-sitter-rust = { version = "*", optional = true } diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml index 1c0d0e93ea..57b91876e3 100644 --- a/crates/feedback/Cargo.toml +++ b/crates/feedback/Cargo.toml @@ -24,8 +24,8 @@ lazy_static = "1.4.0" postage = { workspace = true } project = { path = "../project" } search = { path = "../search" } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } settings = { path = "../settings" } sysinfo = "0.27.1" theme = { path = "../theme" } diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml index a1a3dbf71a..8c4d853234 100644 --- a/crates/file_finder/Cargo.toml +++ b/crates/file_finder/Cargo.toml @@ -23,7 +23,7 @@ postage = { workspace = true } [dev-dependencies] gpui = { path = "../gpui", features = ["test-support"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" env_logger = "0.9" diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml index 66708943f9..f4981ac13a 100644 --- a/crates/fs/Cargo.toml +++ b/crates/fs/Cargo.toml @@ -24,7 +24,7 @@ smol = "1.2.5" regex = "1.5" git2 = { version = "0.15", default-features = false } serde = { workspace = true } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde_derive = { workspace = true } serde_json = { workspace = true } log = { version = "0.4.16", features = ["kv_unstable_serde"] } libc = "0.2" diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index bd994b5407..8715142dd3 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -41,9 +41,9 @@ rand = "0.8.3" resvg = "0.14" schemars = "0.8" seahash = "4.1" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = "1.0" +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } smallvec = { version = "1.6", features = ["union"] } smol = "1.2" time = { version = "0.3", features = ["serde", "serde-well-known"] } diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml index ac4badbe2a..4311f04391 100644 --- a/crates/language/Cargo.toml +++ b/crates/language/Cargo.toml @@ -46,9 +46,9 @@ parking_lot = "0.11.1" postage = { workspace = true } rand = { version = "0.8.3", optional = true } regex = "1.5" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1", features = ["preserve_order"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } similar = "1.3" smallvec = { version = "1.6", features = ["union"] } smol = "1.2" diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml index 71a6235b95..70032d83aa 100644 --- a/crates/live_kit_client/Cargo.toml +++ b/crates/live_kit_client/Cargo.toml @@ -62,12 +62,12 @@ jwt = "0.16" lazy_static = "1.4" objc = "0.2" parking_lot = "0.11.1" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } sha2 = "0.10" simplelog = "0.9" [build-dependencies] -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } diff --git a/crates/live_kit_server/Cargo.toml b/crates/live_kit_server/Cargo.toml index 319a026456..8cced6d089 100644 --- a/crates/live_kit_server/Cargo.toml +++ b/crates/live_kit_server/Cargo.toml @@ -19,8 +19,8 @@ jwt = "0.16" prost = "0.8" prost-types = "0.8" reqwest = "0.11" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } sha2 = "0.10" [build-dependencies] diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml index aa1f49977c..4370aaab06 100644 --- a/crates/lsp/Cargo.toml +++ b/crates/lsp/Cargo.toml @@ -22,9 +22,9 @@ log = { version = "0.4.16", features = ["kv_unstable_serde"] } lsp-types = "0.91" parking_lot = "0.11" postage = { workspace = true } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1.0", features = ["raw_value"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } smol = "1.2" [dev-dependencies] diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml index e7a8079caa..2371cfa9fd 100644 --- a/crates/picker/Cargo.toml +++ b/crates/picker/Cargo.toml @@ -21,7 +21,7 @@ parking_lot = "0.11.1" [dev-dependencies] gpui = { path = "../gpui", features = ["test-support"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" env_logger = "0.9" diff --git a/crates/plugin/Cargo.toml b/crates/plugin/Cargo.toml index 6b86b19fc8..8c3a2fb83f 100644 --- a/crates/plugin/Cargo.toml +++ b/crates/plugin/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies] -serde = "1.0" -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } bincode = "1.3" plugin_macros = { path = "../plugin_macros" } diff --git a/crates/plugin_macros/Cargo.toml b/crates/plugin_macros/Cargo.toml index e661485373..51cb78c7a1 100644 --- a/crates/plugin_macros/Cargo.toml +++ b/crates/plugin_macros/Cargo.toml @@ -11,6 +11,6 @@ proc-macro = true syn = { version = "1.0", features = ["full", "extra-traits"] } quote = "1.0" proc-macro2 = "1.0" -serde = "1.0" -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } bincode = "1.3" diff --git a/crates/plugin_runtime/Cargo.toml b/crates/plugin_runtime/Cargo.toml index 13efa10dc2..cf509a20d3 100644 --- a/crates/plugin_runtime/Cargo.toml +++ b/crates/plugin_runtime/Cargo.toml @@ -9,9 +9,9 @@ wasmtime = "0.38" wasmtime-wasi = "0.38" wasi-common = "0.38" anyhow = { version = "1.0", features = ["std"] } -serde = "1.0" -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = "1.0" +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } bincode = "1.3" pollster = "0.2.5" smol = "1.2.5" diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index b42a6fc674..f5c144a3ad 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -49,9 +49,9 @@ postage = { workspace = true } pulldown-cmark = { version = "0.9.1", default-features = false } rand = "0.8.3" regex = "1.5" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } sha2 = "0.10" similar = "1.3" smol = "1.2.5" diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml index d245700d58..2b72959e25 100644 --- a/crates/project_panel/Cargo.toml +++ b/crates/project_panel/Cargo.toml @@ -27,4 +27,4 @@ unicase = "2.6" editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml index ff71a2493e..2773dd2f3b 100644 --- a/crates/rpc/Cargo.toml +++ b/crates/rpc/Cargo.toml @@ -26,8 +26,8 @@ parking_lot = "0.11.1" prost = "0.8" rand = "0.8" rsa = "0.4" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } smol-timeout = "0.6" tracing = { version = "0.1.34", features = ["log"] } zstd = "0.11" diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml index e8c03a1a5e..f786d4abc6 100644 --- a/crates/search/Cargo.toml +++ b/crates/search/Cargo.toml @@ -23,14 +23,14 @@ anyhow = "1.0" futures = "0.3" log = { version = "0.4.16", features = ["kv_unstable_serde"] } postage = { workspace = true } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } smallvec = { version = "1.6", features = ["union"] } smol = "1.2" [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } workspace = { path = "../workspace", features = ["test-support"] } unindent = "0.1" diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml index 566fcfe355..6eeab7d7d9 100644 --- a/crates/settings/Cargo.toml +++ b/crates/settings/Cargo.toml @@ -25,7 +25,7 @@ json_comments = "0.2" postage = { workspace = true } schemars = "0.8" serde = { workspace = true } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde_derive = { workspace = true } serde_json = { workspace = true } serde_path_to_error = "0.1.4" toml = "0.5" diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml index 56a8a3c452..56796fca59 100644 --- a/crates/terminal/Cargo.toml +++ b/crates/terminal/Cargo.toml @@ -29,8 +29,8 @@ libc = "0.2" anyhow = "1" thiserror = "1.0" lazy_static = "1.4.0" -serde = { version = "1.0", features = ["derive"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } [dev-dependencies] rand = "0.8.5" diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml index 1e5b9d6070..726a1a674f 100644 --- a/crates/terminal_view/Cargo.toml +++ b/crates/terminal_view/Cargo.toml @@ -33,8 +33,8 @@ libc = "0.2" anyhow = "1" thiserror = "1.0" lazy_static = "1.4.0" -serde = { version = "1.0", features = ["derive"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml index a0ef4ad9f8..cf8ff1db14 100644 --- a/crates/theme/Cargo.toml +++ b/crates/theme/Cargo.toml @@ -13,8 +13,8 @@ gpui = { path = "../gpui" } anyhow = "1.0.38" indexmap = "1.6.2" parking_lot = "0.11.1" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } serde_path_to_error = "0.1.4" toml = "0.5" diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml index 558ca588b4..0e3a8d96be 100644 --- a/crates/util/Cargo.toml +++ b/crates/util/Cargo.toml @@ -22,8 +22,8 @@ smol = "1.2.5" url = "2.2" rand = { workspace = true } tempdir = { version = "0.3.7", optional = true } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { workspace = true } +serde_json = { workspace = true } git2 = { version = "0.15", default-features = false, optional = true } dirs = "3.0" diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml index dd79d56d8f..bafa2c7a55 100644 --- a/crates/vim/Cargo.toml +++ b/crates/vim/Cargo.toml @@ -12,8 +12,8 @@ doctest = false neovim = ["nvim-rs", "async-compat", "async-trait", "tokio"] [dependencies] -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } +serde = { workspace = true } +serde_derive = { workspace = true } itertools = "0.10" log = { version = "0.4.16", features = ["kv_unstable_serde"] } @@ -21,7 +21,7 @@ async-compat = { version = "0.2.1", "optional" = true } async-trait = { version = "0.1", "optional" = true } nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true } tokio = { version = "1.15", "optional" = true } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } assets = { path = "../assets" } collections = { path = "../collections" } diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index 9a6813f627..5a2380de3f 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -44,9 +44,9 @@ env_logger = "0.9.1" log = { version = "0.4.16", features = ["kv_unstable_serde"] } parking_lot = "0.11.1" postage = { workspace = true } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } smallvec = { version = "1.6", features = ["union"] } indoc = "1.0.4" uuid = { version = "1.1.2", features = ["v4"] } diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 812fae9e0a..a9cbfbc737 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -88,9 +88,9 @@ rand = "0.8.3" regex = "1.5" rsa = "0.4" rust-embed = { version = "6.3", features = ["include-exclude"] } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_derive = { version = "1.0", features = ["deserialize_in_place"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } serde_path_to_error = "0.1.4" simplelog = "0.9" smallvec = { version = "1.6", features = ["union"] } @@ -138,7 +138,7 @@ util = { path = "../util", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] } env_logger = "0.9" -serde_json = { version = "1.0", features = ["preserve_order"] } +serde_json = { workspace = true } unindent = "0.1.7" [package.metadata.bundle-dev] diff --git a/plugins/json_language/Cargo.toml b/plugins/json_language/Cargo.toml index effbf2ed8a..5a5072995f 100644 --- a/plugins/json_language/Cargo.toml +++ b/plugins/json_language/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] plugin = { path = "../../crates/plugin" } -serde = { version = "1.0", features = ["derive"] } +serde = { version = "1.0", features = ["derive", "rc"] } serde_derive = { version = "1.0", features = ["deserialize_in_place"] } serde_json = "1.0"