From 2e2fb0a21811ce2dbaca5bb738b0be8f94de051e Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Tue, 21 Jul 2026 10:58:16 +0300
Subject: [PATCH] zed: Unify dependencies (#61381)

# Objective

Unify dependencies inside of the root `Cargo.toml` to prevent versions
from going out of sync and creating copies of dependencies.

## Testing

- All tests pass, nothing touches the `Cargo.lock`

## Review

Review is easiest by going through commit by commit.

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.toml                     |  8 ++++++++
 crates/gpui/Cargo.toml         | 18 +++++++++---------
 crates/gpui_linux/Cargo.toml   |  4 ++--
 crates/gpui_macos/Cargo.toml   | 16 ++++++++--------
 crates/gpui_wgpu/Cargo.toml    |  4 ++--
 crates/gpui_windows/Cargo.toml |  2 +-
 crates/media/Cargo.toml        |  2 +-
 7 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9d0b9da1826..551596b61c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -555,12 +555,14 @@ aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] }
 backtrace = "0.3"
 base64 = "0.22"
 bitflags = "2.6.0"
+block = "0.1"
 block2 = "0.6"
 brotli = "8.0.2"
 bytes = "1.0"
 cargo_metadata = "0.19"
 cargo_toml = "0.21"
 brush-parser = "0.3"
+cbindgen = { version = "0.28.0", default-features = false }
 cfg-if = "1.0.3"
 chardetng = "0.1"
 chrono = { version = "0.4", features = ["serde"] }
@@ -575,6 +577,8 @@ const_format = "0.2"
 convert_case = "0.11.0"
 core-foundation = "0.10"
 core-foundation-sys = "0.8.6"
+core-graphics = "0.24"
+core-text = "21"
 core-video = { version = "0.5.2", features = ["metal"] }
 cpal = "0.17"
 crash-handler = "0.7"
@@ -601,10 +605,12 @@ ec4rs = { version = "1.2", features = ["allow-empty-values"] }
 emojis = "0.6.1"
 env_logger = "0.11"
 encoding_rs = "0.8"
+etagere = "0.2"
 exec = "0.3.1"
 fancy-regex = "0.18.0"
 fork = "0.4.0"
 flume = "0.12"
+foreign-types = "0.5"
 futures = "0.3.32"
 futures-concurrency = "7.7.1"
 futures-lite = "1.13"
@@ -717,6 +723,7 @@ palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 parse_int = "0.9"
+pathfinder_geometry = "0.5"
 pciid-parser = "0.8.0"
 pathdiff = "0.2"
 percent-encoding = "2.3.2"
@@ -798,6 +805,7 @@ stacksafe = "0.1"
 streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.27.2", features = ["derive"] }
+swash = "0.2.6"
 syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }
 sys-locale = "0.3.1"
 sysinfo = "0.37.0"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 8fd4a7c7639..e8d1b657d05 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -47,7 +47,7 @@ doctest = false
 [dependencies]
 accesskit.workspace = true
 anyhow.workspace = true
-async-task = "4.7"
+async-task.workspace = true
 backtrace = { workspace = true, optional = true }
 bitflags.workspace = true
 
@@ -55,7 +55,7 @@ collections.workspace = true
 criterion = { workspace = true, optional = true }
 ctor.workspace = true
 derive_more.workspace = true
-etagere = "0.2"
+etagere.workspace = true
 futures.workspace = true
 futures-concurrency.workspace = true
 gpui_macros.workspace = true
@@ -111,17 +111,17 @@ uuid = { workspace = true, features = ["js"] }
 
 
 [target.'cfg(target_os = "macos")'.dependencies]
-block = "0.1"
+block.workspace = true
 cocoa.workspace = true
 cocoa-foundation.workspace = true
 core-foundation.workspace = true
 core-foundation-sys.workspace = true
-core-graphics = "0.24"
+core-graphics.workspace = true
 core-video.workspace = true
-core-text = "21"
+core-text.workspace = true
 # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
-foreign-types = "0.5"
+foreign-types.workspace = true
 log.workspace = true
 media.workspace = true
 objc.workspace = true
@@ -132,7 +132,7 @@ mach2.workspace = true
 metal.workspace = true
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
-pathfinder_geometry = "0.5"
+pathfinder_geometry.workspace = true
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
 scap = { workspace = true, optional = true }
@@ -140,7 +140,7 @@ scap = { workspace = true, optional = true }
 
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Power"] }
+windows = { workspace = true, features = ["Win32_Foundation", "Win32_System_Power"] }
 
 
 [dev-dependencies]
@@ -168,7 +168,7 @@ embed-resource = { version = "3.0", optional = true }
 
 [target.'cfg(target_os = "macos")'.build-dependencies]
 bindgen = "0.71"
-cbindgen = { version = "0.28.0", default-features = false }
+cbindgen.workspace = true
 
 
 
diff --git a/crates/gpui_linux/Cargo.toml b/crates/gpui_linux/Cargo.toml
index 44884414c0c..9d7360c8168 100644
--- a/crates/gpui_linux/Cargo.toml
+++ b/crates/gpui_linux/Cargo.toml
@@ -66,7 +66,7 @@ itertools.workspace = true
 libc.workspace = true
 log.workspace = true
 parking_lot.workspace = true
-pathfinder_geometry = "0.5"
+pathfinder_geometry.workspace = true
 pollster.workspace = true
 profiling.workspace = true
 smallvec.workspace = true
@@ -86,7 +86,7 @@ raw-window-handle.workspace = true
 
 # Used in both windowing options
 ashpd = { workspace = true, optional = true }
-swash = { version = "0.2.6" }
+swash.workspace = true
 bitflags = { workspace = true, optional = true }
 filedescriptor = { version = "0.8.2", optional = true }
 open = { version = "5.2.0", optional = true }
diff --git a/crates/gpui_macos/Cargo.toml b/crates/gpui_macos/Cargo.toml
index 610d65a71f4..5e0dbf57805 100644
--- a/crates/gpui_macos/Cargo.toml
+++ b/crates/gpui_macos/Cargo.toml
@@ -25,23 +25,23 @@ gpui.workspace = true
 accesskit.workspace = true
 accesskit_macos.workspace = true
 anyhow.workspace = true
-async-task = "4.7"
-block = "0.1"
+async-task.workspace = true
+block.workspace = true
 block2.workspace = true
 cocoa.workspace = true
 collections.workspace = true
 core-foundation.workspace = true
 core-foundation-sys.workspace = true
-core-graphics = "0.24"
-core-text = "21"
+core-graphics.workspace = true
+core-text.workspace = true
 core-video.workspace = true
 ctor.workspace = true
 derive_more.workspace = true
 dispatch2 = "0.3.1"
-etagere = "0.2"
+etagere.workspace = true
 # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
-foreign-types = "0.5"
+foreign-types.workspace = true
 futures.workspace = true
 gpui_util.workspace = true
 image.workspace = true
@@ -57,7 +57,7 @@ objc2-app-kit.workspace = true
 objc2-foundation.workspace = true
 objc2-user-notifications.workspace = true
 parking_lot.workspace = true
-pathfinder_geometry = "0.5"
+pathfinder_geometry.workspace = true
 raw-window-handle.workspace = true
 semver.workspace = true
 smallvec.workspace = true
@@ -65,7 +65,7 @@ strum.workspace = true
 uuid.workspace = true
 
 [target.'cfg(target_os = "macos")'.build-dependencies]
-cbindgen = { version = "0.28.0", default-features = false }
+cbindgen.workspace = true
 gpui.workspace = true
 
 # When this crate is itself being tested (cargo test -p gpui_macos), its own
diff --git a/crates/gpui_wgpu/Cargo.toml b/crates/gpui_wgpu/Cargo.toml
index 181b3588b4b..c2eb51f9f13 100644
--- a/crates/gpui_wgpu/Cargo.toml
+++ b/crates/gpui_wgpu/Cargo.toml
@@ -21,14 +21,14 @@ anyhow.workspace = true
 bytemuck = "1"
 collections.workspace = true
 cosmic-text = "0.19.0"
-etagere = "0.2"
+etagere.workspace = true
 itertools.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 profiling.workspace = true
 raw-window-handle.workspace = true
 smallvec.workspace = true
-swash = "0.2.6"
+swash.workspace = true
 unicode-segmentation.workspace = true
 gpui_util.workspace = true
 wgpu.workspace = true
diff --git a/crates/gpui_windows/Cargo.toml b/crates/gpui_windows/Cargo.toml
index 0715cbc78ae..2baa3c7b172 100644
--- a/crates/gpui_windows/Cargo.toml
+++ b/crates/gpui_windows/Cargo.toml
@@ -25,7 +25,7 @@ accesskit_windows.workspace = true
 anyhow.workspace = true
 collections.workspace = true
 dunce.workspace = true
-etagere = "0.2"
+etagere.workspace = true
 futures.workspace = true
 gpui_util.workspace = true
 image.workspace = true
diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml
index 90a3d938333..7dcf7e356ed 100644
--- a/crates/media/Cargo.toml
+++ b/crates/media/Cargo.toml
@@ -19,7 +19,7 @@ anyhow.workspace = true
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation.workspace = true
 ctor.workspace = true
-foreign-types = "0.5"
+foreign-types.workspace = true
 metal.workspace = true
 core-video.workspace = true
 objc.workspace = true