d-0020-remove-windows-dependencies
authorDebian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Mon, 6 May 2024 08:25:32 +0000 (10:25 +0200)
committerFabian Grünbichler <debian@fabian.gruenbichler.email>
Tue, 8 Oct 2024 12:34:41 +0000 (14:34 +0200)
use something like

 find src compiler library -iname Cargo.toml -exec grep -H -n -e 'windows-sys' -e 'winapi' -e 'ntapi' -e 'wincon' -e 'winreg' -e 'windows' {} \;

to find and eliminate dependencies on windows-only crates when rebasing.

windows-bindgen and windows-metadata should not be removed, they are needed for
the build and don't pull in windows-sys and friends.

Forwarded: not-needed

===================================================================

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0020-remove-windows-dependencies.patch

25 files changed:
compiler/rustc_codegen_ssa/Cargo.toml
compiler/rustc_data_structures/Cargo.toml
compiler/rustc_driver_impl/Cargo.toml
compiler/rustc_errors/Cargo.toml
compiler/rustc_session/Cargo.toml
library/backtrace/Cargo.toml
src/bootstrap/Cargo.toml
src/tools/cargo/Cargo.toml
src/tools/cargo/crates/cargo-test-support/Cargo.toml
src/tools/cargo/crates/cargo-util/Cargo.toml
src/tools/cargo/crates/home/Cargo.toml
src/tools/cargo/credential/cargo-credential/Cargo.toml
src/tools/cargo/src/cargo/util/auth/mod.rs
src/tools/compiletest/Cargo.toml
src/tools/rust-analyzer/crates/profile/Cargo.toml
src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
src/tools/rust-analyzer/crates/stdx/Cargo.toml
src/tools/rustc-perf/collector/Cargo.toml
src/tools/rustc-perf/collector/compile-benchmarks/cargo-0.60.0/Cargo.toml
src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/gfx/Cargo.toml
src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/style/Cargo.toml
src/tools/rustc-perf/collector/compile-benchmarks/tokio-webpush-simple/native-tls-0.1.5/Cargo.toml
src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/example-compositor/compositor/Cargo.toml
src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/webrender/Cargo.toml
src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/Cargo.toml

index f7b5b0f310b677ca7d1a30ed935267ca3889a2dc..44ddadada35b3ba89743ccbdae093e501a51c285 100644 (file)
@@ -53,7 +53,3 @@ libc = "0.2.50"
 version = "0.32.1"
 default-features = false
 features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
-
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
-features = ["Win32_Globalization"]
index 3794a6e043c6d6e2510b58f312df7c3740c54931..02b2641807d83db55cbc4fa2dab9fb64d91d8ef9 100644 (file)
@@ -31,16 +31,6 @@ tracing = "0.1"
 [dependencies.parking_lot]
 version = "0.12"
 
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
-features = [
-    "Win32_Foundation",
-    "Win32_Storage_FileSystem",
-    "Win32_System_IO",
-    "Win32_System_ProcessStatus",
-    "Win32_System_Threading",
-]
-
 [target.'cfg(unix)'.dependencies]
 # tidy-alphabetical-start
 libc = "0.2"
index 91cbffcd7072bc7dea11be30d152a0db19069639..a23d9d7dc84fa119b386659ea56d6a9316361e29 100644 (file)
@@ -57,12 +57,6 @@ tracing = { version = "0.1.35" }
 libc = "0.2"
 # tidy-alphabetical-end
 
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
-features = [
-    "Win32_System_Diagnostics_Debug",
-]
-
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 # tidy-alphabetical-start
 ctrlc = "3.4.4"
index cc114fdcd8c35b026405df4f912afd568f096cf3..d60fa6538525b125b8d32b80f79ce698ccfe1376 100644 (file)
@@ -29,14 +29,6 @@ tracing = "0.1"
 unicode-width = "0.1.4"
 # tidy-alphabetical-end
 
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
-features = [
-    "Win32_Foundation",
-    "Win32_Security",
-    "Win32_System_Threading",
-]
-
 [features]
 # tidy-alphabetical-start
 rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler']
index 721a9275d018878da1440ffb726fef5bd3602eda..099c79d0aad1c05a0be35e3ce12b5f3ad30b8276 100644 (file)
@@ -28,10 +28,3 @@ tracing = "0.1"
 # tidy-alphabetical-start
 libc = "0.2"
 # tidy-alphabetical-end
-
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
-features = [
-    "Win32_Foundation",
-    "Win32_System_LibraryLoader",
-]
index 3c7102407a1b73387bc6b329b22ed16015e93d18..f1c049a9192dcc0476f4eabc1274d50c5bf2e7b5 100644 (file)
@@ -49,9 +49,6 @@ version = "0.36.0"
 default-features = false
 features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive']
 
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.9", optional = true }
-
 [build-dependencies]
 # Only needed for Android, but cannot be target dependent
 # https://github.com/rust-lang/cargo/issues/4932
@@ -83,18 +80,6 @@ kernel32 = []
 libunwind = []
 unix-backtrace = []
 verify-winapi = [
-  'winapi/dbghelp',
-  'winapi/handleapi',
-  'winapi/libloaderapi',
-  'winapi/memoryapi',
-  'winapi/minwindef',
-  'winapi/processthreadsapi',
-  'winapi/synchapi',
-  'winapi/tlhelp32',
-  'winapi/winbase',
-  'winapi/winnt',
-  'winapi/winnls',
-  'winapi/stringapiset',
 ]
 
 [[example]]
index f723407c3ce3133efdccdbfbbc8c0d70709d8eef..03f64c1297e7758636c6220e70d8783822d53171 100644 (file)
@@ -65,21 +65,6 @@ xz2 = "0.1"
 # Dependencies needed by the build-metrics feature
 sysinfo = { version = "0.30", default-features = false, optional = true }
 
-[target.'cfg(windows)'.dependencies.junction]
-version = "1.0.0"
-
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.52"
-features = [
-    "Win32_Foundation",
-    "Win32_Security",
-    "Win32_System_Diagnostics_Debug",
-    "Win32_System_JobObjects",
-    "Win32_System_ProcessStatus",
-    "Win32_System_Threading",
-    "Win32_System_Time",
-]
-
 [dev-dependencies]
 pretty_assertions = "1.4"
 
index a0a8a6a49f429c4abfe93418d0f205108bb574ea..6895f6471ce700a1d693294eeafaee9de02dd883 100644 (file)
@@ -2,7 +2,9 @@
 resolver = "2"
 members = [
   "crates/*",
-  "credential/*",
+  "credential/cargo-credential",
+  "credential/cargo-credential-1password",
+  "credential/cargo-credential-libsecret",
   "benches/benchsuite",
   "benches/capture",
 ]
@@ -27,8 +29,6 @@ bytesize = "1.3"
 cargo = { path = "" }
 cargo-credential = { version = "0.4.2", path = "credential/cargo-credential" }
 cargo-credential-libsecret = { version = "0.4.7", path = "credential/cargo-credential-libsecret" }
-cargo-credential-macos-keychain = { version = "0.4.7", path = "credential/cargo-credential-macos-keychain" }
-cargo-credential-wincred = { version = "0.4.7", path = "credential/cargo-credential-wincred" }
 cargo-platform = { path = "crates/cargo-platform", version = "0.1.5" }
 cargo-test-macro = { version = "0.3.0", path = "crates/cargo-test-macro" }
 cargo-test-support = { version = "0.3.0", path = "crates/cargo-test-support" }
@@ -107,7 +107,6 @@ unicode-xid = "0.2.4"
 url = "2.5.0"
 varisat = "0.2.2"
 walkdir = "2.5.0"
-windows-sys = "0.52"
 
 [workspace.lints.rust]
 rust_2018_idioms = "warn" # TODO: could this be removed?
@@ -148,6 +147,7 @@ anyhow.workspace = true
 base64.workspace = true
 bytesize.workspace = true
 cargo-credential.workspace = true
+cargo-credential-libsecret.workspace = true
 cargo-platform.workspace = true
 cargo-util-schemas.workspace = true
 cargo-util.workspace = true
@@ -214,27 +214,9 @@ libc.workspace = true
 [target.'cfg(target_os = "linux")'.dependencies]
 cargo-credential-libsecret.workspace = true
 
-[target.'cfg(target_os = "macos")'.dependencies]
-cargo-credential-macos-keychain.workspace = true
-
 [target.'cfg(not(windows))'.dependencies]
 openssl = { workspace = true, optional = true }
 
-[target.'cfg(windows)'.dependencies]
-cargo-credential-wincred.workspace = true
-
-[target.'cfg(windows)'.dependencies.windows-sys]
-workspace = true
-features = [
-  "Win32_Foundation",
-  "Win32_Security",
-  "Win32_Storage_FileSystem",
-  "Win32_System_IO",
-  "Win32_System_Console",
-  "Win32_System_JobObjects",
-  "Win32_System_Threading",
-]
-
 [dev-dependencies]
 annotate-snippets = { workspace = true, features = ["testing-colors"] }
 cargo-test-support.workspace = true
index f6e1ffa2d395e0a97f95d403f7399b784eb8000b..dd360aa2e1a676cc3847fd6ad7cd67683792dd86 100644 (file)
@@ -34,8 +34,5 @@ toml.workspace = true
 url.workspace = true
 walkdir.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] }
-
 [lints]
 workspace = true
index 3b1b94d1d621287ae12140a613bad752ccc3f2eb..5be6c8343bdbb2304e2704ba86c03d6f00e913de 100644 (file)
@@ -21,15 +21,8 @@ tempfile.workspace = true
 tracing.workspace = true
 walkdir.workspace = true
 
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation.workspace = true
-
 [target.'cfg(unix)'.dependencies]
 libc.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-miow.workspace = true
-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] }
-
 [lints]
 workspace = true
index 91742e534b68147c5acf86288a63bf3ea240fe04..0054cadc37cb46f05807348340d46a78e75edd02 100644 (file)
@@ -17,8 +17,5 @@ homepage.workspace = true
 repository.workspace = true
 description = "Shared definitions of home directories."
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell", "Win32_System_Com"] }
-
 [lints]
 workspace = true
index 63fd82359921b3c7e6187f1ffa434c8ee8f72083..55f8d9c663cc08f249478534430189a1886b83b2 100644 (file)
@@ -18,9 +18,6 @@ time.workspace = true
 [target.'cfg(unix)'.dependencies]
 libc.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true, features = ["Win32_System_Console", "Win32_Foundation"] }
-
 [dev-dependencies]
 snapbox = { workspace = true, features = ["examples"] }
 
index cf4cccb9753179a44495eefac52a2781db4aac05..c69dd9318c5685c1614551aecfc0fbedd1839ddc 100644 (file)
@@ -529,11 +529,6 @@ fn credential_action(
             }
             "cargo:paseto" => bail!("cargo:paseto requires -Zasymmetric-token"),
             "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}),
-            #[cfg(windows)]
-            "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}),
-            #[cfg(target_os = "macos")]
-            "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}),
-            #[cfg(target_os = "linux")]
             "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}),
             name if BUILT_IN_PROVIDERS.contains(&name) => {
                 Box::new(cargo_credential::UnsupportedCredential {})
index 52beb4c8b3decafd727170ab085f64ccf1bc9da8..50acf5bdb97415d305dfe04ad5f269f6721325e7 100644 (file)
@@ -28,13 +28,3 @@ home = "0.5.5"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
-
-[target.'cfg(windows)'.dependencies]
-miow = "0.6"
-
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
-features = [
-    "Win32_Foundation",
-    "Win32_System_Diagnostics_Debug",
-]
index 20eab314d15f67601c69f5b6513e267f7ff9bc6c..e0df1014bf3954e343a70205bcb67007a745e91e 100644 (file)
@@ -18,9 +18,6 @@ libc.workspace = true
 [target.'cfg(target_os = "linux")'.dependencies]
 perf-event = "=0.4.7"
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.52", features = ["Win32_System_Threading", "Win32_System_ProcessStatus"] }
-
 [features]
 cpu_profiler = []
 
index 93fb55ede8ea29ef67910793776b96695b704585..78a5d8c30b2ef4d52da51a5ec2dd33d255d32030 100644 (file)
@@ -69,9 +69,6 @@ vfs-notify.workspace = true
 vfs.workspace = true
 paths.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.52", features = ["Win32_System_Threading"] }
-
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true }
 
index 99824df1f69d1803b66309f168fd6d94e419aa23..7e3b4c11965c9630bc5bb04323dd9852f159a5b2 100644 (file)
@@ -20,10 +20,6 @@ crossbeam-channel = "0.5.5"
 itertools.workspace = true
 # Think twice before adding anything here
 
-[target.'cfg(windows)'.dependencies]
-miow = "0.6.0"
-windows-sys = { version = "0.52", features = ["Win32_Foundation"] }
-
 [features]
 # Uncomment to enable for the whole crate graph
 # default = [ "backtrace" ]
index fed0fa9fc8e02476abc8cb8e70a1defe3f1e8252..2163f6496d09216d0ca79150e03f9e4813f4cb28 100644 (file)
@@ -45,10 +45,6 @@ analyzeme = "12.0.0"
 
 benchlib = { path = "benchlib" }
 
-[target.'cfg(windows)'.dependencies]
-miow = "0.3"
-windows-sys = { version = "0.45.0", features = ["Win32_Foundation"] }
-
 [features]
 # Enable more precise Cachegrind profiles for runtime benchmarks.
 # Requires a recent Valgrind to be installed.
index 12ee1eec03238c122157601ec6ac13eb992b4760..a89f82f55dd6e3b4033cab4b1e7dce65c2c6e5d4 100644 (file)
@@ -209,28 +209,4 @@ deny-warnings = []
 pretty-env-logger = ["pretty_env_logger"]
 vendored-openssl = ["openssl/vendored"]
 
-[target."cfg(windows)".dependencies.fwdansi]
-version = "1.1.0"
-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = [
-    "basetsd",
-    "handleapi",
-    "jobapi",
-    "jobapi2",
-    "memoryapi",
-    "minwindef",
-    "ntdef",
-    "ntstatus",
-    "processenv",
-    "processthreadsapi",
-    "psapi",
-    "synchapi",
-    "winerror",
-    "winbase",
-    "wincon",
-    "winnt",
-]
-
 [workspace]
index 3d7aea1b59f70a322cccfadd2a2217c7b93c0c7f..57feefef5afee058fd1247383481297111e7b714 100644 (file)
@@ -59,7 +59,3 @@ xml5ever = {version = "0.10"}
 
 [target.'cfg(any(target_feature = "sse2", target_feature = "neon"))'.dependencies]
 simd = "0.2.0"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.4"
-truetype = "0.26"
index 23130d0912898785f87e0bb840769b340cd178ad..5f338897ecf349f305e0e0de3194120f3992df4c 100644 (file)
@@ -77,9 +77,6 @@ time = "0.1"
 unicode-bidi = "0.3"
 unicode-segmentation = "1.0"
 
-[target.'cfg(windows)'.dependencies]
-kernel32-sys = "0.2"
-
 [build-dependencies]
 lazy_static = "0.2"
 log = "0.3"
index 38bd630e5d79de6167b00655c7de53dbf384ba3e..6abd17c796caf2ae8ac7c0c2f6e48cb6d841c048 100644 (file)
@@ -33,7 +33,5 @@ version = "0.1.15"
 
 [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.tempdir]
 version = "0.3"
-[target."cfg(target_os = \"windows\")".dependencies.schannel]
-version = "0.1.7"
 
-[workspace]
\ No newline at end of file
+[workspace]
index 4202332c41dbb214c361fa4d7fa55346e66b4062..2d3578771288c52d7f3262573039bb96a27181b8 100644 (file)
@@ -9,8 +9,5 @@ license = "MPL-2.0"
 webrender = { path = "../../webrender" }
 gleam = "0.13.1"
 
-[target.'cfg(windows)'.dependencies]
-compositor-windows = { path = "../compositor-windows" }
-
 [target.'cfg(target_os = "linux")'.dependencies]
 compositor-wayland = { path = "../compositor-wayland" }
index ee727d4251cd53d643666f2c38ef383df25c5fff..ddc3c1494ae1d7264682a1c23b2e68ec29b04739 100644 (file)
@@ -61,9 +61,6 @@ rand = "0.4"
 freetype = { version = "0.7", default-features = false }
 libc = "0.2"
 
-[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.11"
-
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9.2"
 core-graphics = "0.22.3"
index 04101b92ce456150d7c5b57f692171d070cb9a10..9b6e1e54bb8f24978f19999d843f980a12ad0c7d 100644 (file)
@@ -42,10 +42,6 @@ default = [ "env_logger" ]
 headless = [ "osmesa-sys", "osmesa-src" ]
 software = [ "swgl" ]
 
-[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.11"
-mozangle = { version = "0.3.2", features = ["egl"] }
-
 [target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
 font-loader = "0.11"