History

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 ...

tidely committed 3 months ago

Commit 2e2fb0a1 parent 3ad80867 files · +31 −23Browse files

Unified · Split

7 files
  1. Cargo.toml +8 −0
  2. crates/gpui/Cargo.toml +9 −9
  3. crates/gpui_linux/Cargo.toml +2 −2
  4. crates/gpui_macos/Cargo.toml +8 −8
  5. crates/gpui_wgpu/Cargo.toml +2 −2
  6. crates/gpui_windows/Cargo.toml +1 −1
  7. crates/media/Cargo.toml +1 −1
Cargo.toml+8−0
@@ -555,12 +555,14 @@ aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] } · 554 unmodified lines
555555 backtrace = "0.3"
556556 base64 = "0.22"
557557 bitflags = "2.6.0"
558+block = "0.1"
558559 block2 = "0.6"
559560 brotli = "8.0.2"
560561 bytes = "1.0"
561562 cargo_metadata = "0.19"
562563 cargo_toml = "0.21"
563564 brush-parser = "0.3"
565+cbindgen = { version = "0.28.0", default-features = false }
564566 cfg-if = "1.0.3"
565567 chardetng = "0.1"
566568 chrono = { version = "0.4", features = ["serde"] }
@@ -575,6 +577,8 @@ const_format = "0.2" · 8 unmodified lines
575577 convert_case = "0.11.0"
576578 core-foundation = "0.10"
577579 core-foundation-sys = "0.8.6"
580+core-graphics = "0.24"
581+core-text = "21"
578582 core-video = { version = "0.5.2", features = ["metal"] }
579583 cpal = "0.17"
580584 crash-handler = "0.7"
@@ -601,10 +605,12 @@ ec4rs = { version = "1.2", features = ["allow-empty-values"] } · 20 unmodified lines
601605 emojis = "0.6.1"
602606 env_logger = "0.11"
603607 encoding_rs = "0.8"
608+etagere = "0.2"
604609 exec = "0.3.1"
605610 fancy-regex = "0.18.0"
606611 fork = "0.4.0"
607612 flume = "0.12"
613+foreign-types = "0.5"
608614 futures = "0.3.32"
609615 futures-concurrency = "7.7.1"
610616 futures-lite = "1.13"
@@ -717,6 +723,7 @@ palette = { version = "0.7.5", default-features = false, features = ["std"] } · 106 unmodified lines
717723 parking_lot = "0.12.1"
718724 partial-json-fixer = "0.5.3"
719725 parse_int = "0.9"
726+pathfinder_geometry = "0.5"
720727 pciid-parser = "0.8.0"
721728 pathdiff = "0.2"
722729 percent-encoding = "2.3.2"
@@ -798,6 +805,7 @@ stacksafe = "0.1" · 75 unmodified lines
798805 streaming-iterator = "0.1"
799806 strsim = "0.11"
800807 strum = { version = "0.27.2", features = ["derive"] }
808+swash = "0.2.6"
801809 syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }
802810 sys-locale = "0.3.1"
803811 sysinfo = "0.37.0"
crates/gpui/Cargo.toml+9−9
@@ -47,7 +47,7 @@ doctest = false · 46 unmodified lines
4747 [dependencies]
4848 accesskit.workspace = true
4949 anyhow.workspace = true
50−async-task = "4.7"
50+async-task.workspace = true
5151 backtrace = { workspace = true, optional = true }
5252 bitflags.workspace = true
5353
@@ -55,7 +55,7 @@ collections.workspace = true · 1 unmodified line
5555 criterion = { workspace = true, optional = true }
5656 ctor.workspace = true
5757 derive_more.workspace = true
58−etagere = "0.2"
58+etagere.workspace = true
5959 futures.workspace = true
6060 futures-concurrency.workspace = true
6161 gpui_macros.workspace = true
@@ -111,17 +111,17 @@ uuid = { workspace = true, features = ["js"] } · 49 unmodified lines
111111
112112
113113 [target.'cfg(target_os = "macos")'.dependencies]
114−block = "0.1"
114+block.workspace = true
115115 cocoa.workspace = true
116116 cocoa-foundation.workspace = true
117117 core-foundation.workspace = true
118118 core-foundation-sys.workspace = true
119−core-graphics = "0.24"
119+core-graphics.workspace = true
120120 core-video.workspace = true
121−core-text = "21"
121+core-text.workspace = true
122122 # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
123123 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
124−foreign-types = "0.5"
124+foreign-types.workspace = true
125125 log.workspace = true
126126 media.workspace = true
127127 objc.workspace = true
@@ -132,7 +132,7 @@ mach2.workspace = true · 4 unmodified lines
132132 metal.workspace = true
133133
134134 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
135−pathfinder_geometry = "0.5"
135+pathfinder_geometry.workspace = true
136136
137137 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
138138 scap = { workspace = true, optional = true }
@@ -140,7 +140,7 @@ scap = { workspace = true, optional = true } · 1 unmodified line
140140
141141
142142 [target.'cfg(target_os = "windows")'.dependencies]
143−windows = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Power"] }
143+windows = { workspace = true, features = ["Win32_Foundation", "Win32_System_Power"] }
144144
145145
146146 [dev-dependencies]
@@ -168,7 +168,7 @@ embed-resource = { version = "3.0", optional = true } · 21 unmodified lines
168168
169169 [target.'cfg(target_os = "macos")'.build-dependencies]
170170 bindgen = "0.71"
171−cbindgen = { version = "0.28.0", default-features = false }
171+cbindgen.workspace = true
172172
173173
174174
crates/gpui_linux/Cargo.toml+2−2
@@ -66,7 +66,7 @@ itertools.workspace = true · 65 unmodified lines
6666 libc.workspace = true
6767 log.workspace = true
6868 parking_lot.workspace = true
69−pathfinder_geometry = "0.5"
69+pathfinder_geometry.workspace = true
7070 pollster.workspace = true
7171 profiling.workspace = true
7272 smallvec.workspace = true
@@ -86,7 +86,7 @@ raw-window-handle.workspace = true · 13 unmodified lines
8686
8787 # Used in both windowing options
8888 ashpd = { workspace = true, optional = true }
89−swash = { version = "0.2.6" }
89+swash.workspace = true
9090 bitflags = { workspace = true, optional = true }
9191 filedescriptor = { version = "0.8.2", optional = true }
9292 open = { version = "5.2.0", optional = true }
crates/gpui_macos/Cargo.toml+8−8
@@ -25,23 +25,23 @@ gpui.workspace = true · 24 unmodified lines
2525 accesskit.workspace = true
2626 accesskit_macos.workspace = true
2727 anyhow.workspace = true
28−async-task = "4.7"
29−block = "0.1"
28+async-task.workspace = true
29+block.workspace = true
3030 block2.workspace = true
3131 cocoa.workspace = true
3232 collections.workspace = true
3333 core-foundation.workspace = true
3434 core-foundation-sys.workspace = true
35−core-graphics = "0.24"
36−core-text = "21"
35+core-graphics.workspace = true
36+core-text.workspace = true
3737 core-video.workspace = true
3838 ctor.workspace = true
3939 derive_more.workspace = true
4040 dispatch2 = "0.3.1"
41−etagere = "0.2"
41+etagere.workspace = true
4242 # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
4343 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
44−foreign-types = "0.5"
44+foreign-types.workspace = true
4545 futures.workspace = true
4646 gpui_util.workspace = true
4747 image.workspace = true
@@ -57,7 +57,7 @@ objc2-app-kit.workspace = true · 9 unmodified lines
5757 objc2-foundation.workspace = true
5858 objc2-user-notifications.workspace = true
5959 parking_lot.workspace = true
60−pathfinder_geometry = "0.5"
60+pathfinder_geometry.workspace = true
6161 raw-window-handle.workspace = true
6262 semver.workspace = true
6363 smallvec.workspace = true
@@ -65,7 +65,7 @@ strum.workspace = true · 1 unmodified line
6565 uuid.workspace = true
6666
6767 [target.'cfg(target_os = "macos")'.build-dependencies]
68−cbindgen = { version = "0.28.0", default-features = false }
68+cbindgen.workspace = true
6969 gpui.workspace = true
7070
7171 # When this crate is itself being tested (cargo test -p gpui_macos), its own
crates/gpui_wgpu/Cargo.toml+2−2
@@ -21,14 +21,14 @@ anyhow.workspace = true · 20 unmodified lines
2121 bytemuck = "1"
2222 collections.workspace = true
2323 cosmic-text = "0.19.0"
24−etagere = "0.2"
24+etagere.workspace = true
2525 itertools.workspace = true
2626 log.workspace = true
2727 parking_lot.workspace = true
2828 profiling.workspace = true
2929 raw-window-handle.workspace = true
3030 smallvec.workspace = true
31−swash = "0.2.6"
31+swash.workspace = true
3232 unicode-segmentation.workspace = true
3333 gpui_util.workspace = true
3434 wgpu.workspace = true
crates/gpui_windows/Cargo.toml+1−1
@@ -25,7 +25,7 @@ accesskit_windows.workspace = true · 24 unmodified lines
2525 anyhow.workspace = true
2626 collections.workspace = true
2727 dunce.workspace = true
28−etagere = "0.2"
28+etagere.workspace = true
2929 futures.workspace = true
3030 gpui_util.workspace = true
3131 image.workspace = true
crates/media/Cargo.toml+1−1
@@ -19,7 +19,7 @@ anyhow.workspace = true · 18 unmodified lines
1919 [target.'cfg(target_os = "macos")'.dependencies]
2020 core-foundation.workspace = true
2121 ctor.workspace = true
22−foreign-types = "0.5"
22+foreign-types.workspace = true
2323 metal.workspace = true
2424 core-video.workspace = true
2525 objc.workspace = true