From 0717d30389bf261619c207dc37b76c623cb6d497 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Sun, 3 Mar 2024 11:58:31 -0800 Subject: [PATCH] Move windows up to workspace dependency (#8786) This way we can keep track of what we're using. Release Notes: - N/A --- Cargo.toml | 11 +++++++++++ crates/gpui/Cargo.toml | 10 ++-------- crates/terminal/Cargo.toml | 7 ++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 067c08786d..682908e2f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -309,6 +309,17 @@ wasmtime-wasi = "18.0" which = "6.0.0" sys-locale = "0.3.1" +[workspace.dependencies.windows] +version = "0.53.0" +features = [ + "Win32_Graphics_Gdi", + "Win32_UI_WindowsAndMessaging", + "Win32_Security", + "Win32_System_Threading", +] + + + [patch.crates-io] tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "e4a23971ec3071a09c1e84816954c98f96e98e52" } # Workaround for a broken nightly build of gpui: See #7644 and revisit once 0.5.3 is released. diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index da6fd0af36..273443791d 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -114,14 +114,8 @@ as-raw-xcb-connection = "1" calloop = "0.12.4" calloop-wayland-source = "0.2.0" -[target.'cfg(windows)'.dependencies.windows] -version = "0.53.0" -features = [ - "Win32_Graphics_Gdi", - "Win32_UI_WindowsAndMessaging", - "Win32_Security", - "Win32_System_Threading", -] +[target.'cfg(windows)'.dependencies] +windows.workspace = true [[example]] name = "hello_world" diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml index c41168d639..884b754aac 100644 --- a/crates/terminal/Cargo.toml +++ b/crates/terminal/Cargo.toml @@ -30,11 +30,8 @@ theme.workspace = true thiserror.workspace = true util.workspace = true -[target.'cfg(windows)'.dependencies.windows] -version = "0.53.0" -features = [ - "Win32_System_Threading", -] +[target.'cfg(windows)'.dependencies] +windows.workspace = true [dev-dependencies] rand.workspace = true