Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
zed: Unify dependencies (#61381)
tidely2e2fb0a21811
diff --git a/Cargo.toml b/Cargo.tomlindex 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.tomlindex 8fd4a7c7639..e8d1b657d05 100644--- a/crates/gpui/Cargo.toml+++ b/crates/gpui/Cargo.toml@@ -47,7 +47,7 @@ doctest = false[dependencies]accesskit.workspace = trueanyhow.workspace = true-async-task = "4.7"+async-task.workspace = truebacktrace = { workspace = true, optional = true }bitflags.workspace = true@@ -55,7 +55,7 @@ collections.workspace = truecriterion = { workspace = true, optional = true }ctor.workspace = truederive_more.workspace = true-etagere = "0.2"+etagere.workspace = truefutures.workspace = truefutures-concurrency.workspace = truegpui_macros.workspace = true@@ -111,17 +111,17 @@ uuid = { workspace = true, features = ["js"] }[target.'cfg(target_os = "macos")'.dependencies]-block = "0.1"+block.workspace = truecocoa.workspace = truecocoa-foundation.workspace = truecore-foundation.workspace = truecore-foundation-sys.workspace = true-core-graphics = "0.24"+core-graphics.workspace = truecore-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.iofont-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 = truelog.workspace = truemedia.workspace = trueobjc.workspace = true@@ -132,7 +132,7 @@ mach2.workspace = truemetal.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 = truediff --git a/crates/gpui_linux/Cargo.toml b/crates/gpui_linux/Cargo.tomlindex 44884414c0c..9d7360c8168 100644--- a/crates/gpui_linux/Cargo.toml+++ b/crates/gpui_linux/Cargo.toml@@ -66,7 +66,7 @@ itertools.workspace = truelibc.workspace = truelog.workspace = trueparking_lot.workspace = true-pathfinder_geometry = "0.5"+pathfinder_geometry.workspace = truepollster.workspace = trueprofiling.workspace = truesmallvec.workspace = true@@ -86,7 +86,7 @@ raw-window-handle.workspace = true# Used in both windowing optionsashpd = { workspace = true, optional = true }-swash = { version = "0.2.6" }+swash.workspace = truebitflags = { 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.tomlindex 610d65a71f4..5e0dbf57805 100644--- a/crates/gpui_macos/Cargo.toml+++ b/crates/gpui_macos/Cargo.toml@@ -25,23 +25,23 @@ gpui.workspace = trueaccesskit.workspace = trueaccesskit_macos.workspace = trueanyhow.workspace = true-async-task = "4.7"-block = "0.1"+async-task.workspace = true+block.workspace = trueblock2.workspace = truecocoa.workspace = truecollections.workspace = truecore-foundation.workspace = truecore-foundation-sys.workspace = true-core-graphics = "0.24"-core-text = "21"+core-graphics.workspace = true+core-text.workspace = truecore-video.workspace = truector.workspace = truederive_more.workspace = truedispatch2 = "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.iofont-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 = truefutures.workspace = truegpui_util.workspace = trueimage.workspace = true@@ -57,7 +57,7 @@ objc2-app-kit.workspace = trueobjc2-foundation.workspace = trueobjc2-user-notifications.workspace = trueparking_lot.workspace = true-pathfinder_geometry = "0.5"+pathfinder_geometry.workspace = trueraw-window-handle.workspace = truesemver.workspace = truesmallvec.workspace = true@@ -65,7 +65,7 @@ strum.workspace = trueuuid.workspace = true[target.'cfg(target_os = "macos")'.build-dependencies]-cbindgen = { version = "0.28.0", default-features = false }+cbindgen.workspace = truegpui.workspace = true# When this crate is itself being tested (cargo test -p gpui_macos), its owndiff --git a/crates/gpui_wgpu/Cargo.toml b/crates/gpui_wgpu/Cargo.tomlindex 181b3588b4b..c2eb51f9f13 100644--- a/crates/gpui_wgpu/Cargo.toml+++ b/crates/gpui_wgpu/Cargo.toml@@ -21,14 +21,14 @@ anyhow.workspace = truebytemuck = "1"collections.workspace = truecosmic-text = "0.19.0"-etagere = "0.2"+etagere.workspace = trueitertools.workspace = truelog.workspace = trueparking_lot.workspace = trueprofiling.workspace = trueraw-window-handle.workspace = truesmallvec.workspace = true-swash = "0.2.6"+swash.workspace = trueunicode-segmentation.workspace = truegpui_util.workspace = truewgpu.workspace = truediff --git a/crates/gpui_windows/Cargo.toml b/crates/gpui_windows/Cargo.tomlindex 0715cbc78ae..2baa3c7b172 100644--- a/crates/gpui_windows/Cargo.toml+++ b/crates/gpui_windows/Cargo.toml@@ -25,7 +25,7 @@ accesskit_windows.workspace = trueanyhow.workspace = truecollections.workspace = truedunce.workspace = true-etagere = "0.2"+etagere.workspace = truefutures.workspace = truegpui_util.workspace = trueimage.workspace = truediff --git a/crates/media/Cargo.toml b/crates/media/Cargo.tomlindex 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 = truector.workspace = true-foreign-types = "0.5"+foreign-types.workspace = truemetal.workspace = truecore-video.workspace = trueobjc.workspace = true