From: Debian Rust Maintainers Date: Sat, 4 May 2024 11:38:10 +0000 (+0200) Subject: d-0020-remove-windows-dependencies X-Git-Tag: archive/raspbian/1.72.1+dfsg1-1+rpi1~1^2^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3bd19fce6cf50c1bf348e99eafb7ccc89366438;p=rustc.git d-0020-remove-windows-dependencies =================================================================== Gbp-Pq: Name d-0020-remove-windows-dependencies.patch --- diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 2102f09c56..5ab2a22c26 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -38,16 +38,6 @@ itertools = "0.10.1" [dependencies.parking_lot] version = "0.11" -[target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", - "Win32_System_IO", - "Win32_System_ProcessStatus", - "Win32_System_Threading", -] - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] memmap2 = "0.2.1" diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml index 73a1f79a02..1a0af6d558 100644 --- a/compiler/rustc_driver_impl/Cargo.toml +++ b/compiler/rustc_driver_impl/Cargo.toml @@ -54,12 +54,6 @@ rustc_hir_analysis = { path = "../rustc_hir_analysis" } [target.'cfg(unix)'.dependencies] libc = "0.2" -[target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" -features = [ - "Win32_System_Diagnostics_Debug", -] - [features] llvm = ['rustc_interface/llvm'] max_level_info = ['rustc_log/max_level_info'] diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml index e1ead08ea6..7c3878db73 100644 --- a/compiler/rustc_errors/Cargo.toml +++ b/compiler/rustc_errors/Cargo.toml @@ -25,14 +25,5 @@ termize = "0.1.1" serde = { version = "1.0.125", features = [ "derive" ] } serde_json = "1.0.59" -[target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" -features = [ - "Win32_Foundation", - "Win32_Security", - "Win32_System_Threading", - "Win32_System_WindowsProgramming", -] - [features] rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler'] diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml index 9e337dde99..df2843b9c0 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml @@ -23,10 +23,3 @@ termize = "0.1.1" [target.'cfg(unix)'.dependencies] libc = "0.2" - -[target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" -features = [ - "Win32_Foundation", - "Win32_System_LibraryLoader", -] diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index eeda6d7c12..b189668220 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -61,25 +61,6 @@ sysinfo = { version = "0.26.0", optional = true } [target.'cfg(not(target_os = "solaris"))'.dependencies] fd-lock = "3.0.8" -[target.'cfg(windows)'.dependencies.junction] -version = "1.0.0" - -[target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" -features = [ - "Win32_Foundation", - "Win32_Security", - "Win32_Storage_FileSystem", - "Win32_System_Diagnostics_Debug", - "Win32_System_IO", - "Win32_System_Ioctl", - "Win32_System_JobObjects", - "Win32_System_ProcessStatus", - "Win32_System_SystemServices", - "Win32_System_Threading", - "Win32_System_Time", -] - [dev-dependencies] pretty_assertions = "1.2" diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml index 079322b29a..8f2eec6870 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -82,22 +82,6 @@ walkdir = "2.2" # for more information. rustc-workspace-hack = "1.0.0" -[target.'cfg(windows)'.dependencies] -fwdansi = "1.1.0" - -[target.'cfg(windows)'.dependencies.windows-sys] -version = "0.45" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", - "Win32_System_Console", - "Win32_System_IO", - "Win32_System_Threading", - "Win32_System_JobObjects", - "Win32_Security", - "Win32_System_SystemServices" -] - [dev-dependencies] cargo-test-macro = { path = "crates/cargo-test-macro" } cargo-test-support = { path = "crates/cargo-test-support" } diff --git a/src/tools/cargo/crates/cargo-test-support/Cargo.toml b/src/tools/cargo/crates/cargo-test-support/Cargo.toml index 91e6e4e34c..e2a69b450c 100644 --- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml +++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml @@ -27,6 +27,3 @@ termcolor = "1.1.2" time = { version = "0.3", features = ["parsing", "formatting"]} toml = "0.7.0" url = "2.2.2" - -[target.'cfg(windows)'.dependencies] -windows-sys = { version = "0.45.0", features = ["Win32_Storage_FileSystem"] } diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml index 7427ceb1a8..1d2cd4862d 100644 --- a/src/tools/cargo/crates/cargo-util/Cargo.toml +++ b/src/tools/cargo/crates/cargo-util/Cargo.toml @@ -22,7 +22,3 @@ walkdir = "2.3.1" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] } - -[target.'cfg(windows)'.dependencies] -miow = "0.5.0" -windows-sys = { version = "0.45.0", features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] } diff --git a/src/tools/cargo/crates/home/Cargo.toml b/src/tools/cargo/crates/home/Cargo.toml index 2c5b92bcbb..fc78ba0f8c 100644 --- a/src/tools/cargo/crates/home/Cargo.toml +++ b/src/tools/cargo/crates/home/Cargo.toml @@ -15,6 +15,3 @@ license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/rust-lang/cargo" description = "Shared definitions of home directories." - -[target.'cfg(windows)'.dependencies] -windows-sys = { version = "0.45.0", features = ["Win32_Foundation", "Win32_UI_Shell"] } diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 85fd6523c8..f7b2345541 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -23,13 +23,3 @@ lazycell = "1.3.0" [target.'cfg(unix)'.dependencies] libc = "0.2" - -[target.'cfg(windows)'.dependencies] -miow = "0.5" - -[target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" -features = [ - "Win32_Foundation", - "Win32_System_Diagnostics_Debug", -] diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml index f0f1900c78..3137edbd4a 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml @@ -67,12 +67,6 @@ tt.workspace = true vfs-notify.workspace = true vfs.workspace = true -[target.'cfg(windows)'.dependencies] -winapi = "0.3.9" - -[target.'cfg(not(target_env = "msvc"))'.dependencies] -jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true } - [dev-dependencies] expect-test = "1.4.0" jod-thread = "0.1.2" diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml index c881f2fd3f..5cb4cb0bc3 100644 --- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml +++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml @@ -17,10 +17,6 @@ backtrace = { version = "0.3.65", optional = true } always-assert = { version = "0.1.2", features = ["log"] } # Think twice before adding anything here -[target.'cfg(windows)'.dependencies] -miow = "0.5.0" -winapi = { version = "0.3.9", features = ["winerror"] } - [features] # Uncomment to enable for the whole crate graph # default = [ "backtrace" ]