1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
|
From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Mon, 6 May 2024 10:25:32 +0200
Subject: d-0020-remove-windows-dependencies
===================================================================
---
compiler/rustc_codegen_ssa/Cargo.toml | 4 ---
compiler/rustc_data_structures/Cargo.toml | 10 ------
compiler/rustc_driver_impl/Cargo.toml | 6 ----
compiler/rustc_errors/Cargo.toml | 8 -----
compiler/rustc_session/Cargo.toml | 7 ----
library/backtrace/Cargo.toml | 13 -------
src/bootstrap/Cargo.toml | 15 --------
src/tools/cargo/Cargo.toml | 18 ++--------
.../cargo/crates/cargo-test-support/Cargo.toml | 41 ++++++++++------------
src/tools/cargo/crates/cargo-util/Cargo.toml | 7 ----
src/tools/cargo/crates/home/Cargo.toml | 3 --
src/tools/compiletest/Cargo.toml | 10 ------
src/tools/rust-analyzer/crates/profile/Cargo.toml | 3 --
.../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 ----
src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 ---
15 files changed, 22 insertions(+), 133 deletions(-)
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
index 984efa2..f4c194b 100644
--- a/compiler/rustc_codegen_ssa/Cargo.toml
+++ b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -49,7 +49,3 @@ libc = "0.2.50"
version = "0.31.1"
default-features = false
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"]
-
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.48.0"
-features = ["Win32_Globalization"]
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
index a5c3cb3..5cf1462 100644
--- a/compiler/rustc_data_structures/Cargo.toml
+++ b/compiler/rustc_data_structures/Cargo.toml
@@ -37,16 +37,6 @@ itertools = "0.10.1"
[dependencies.parking_lot]
version = "0.11"
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.48.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 67352c5..f27cb40 100644
--- a/compiler/rustc_driver_impl/Cargo.toml
+++ b/compiler/rustc_driver_impl/Cargo.toml
@@ -56,12 +56,6 @@ rustc_mir_transform = { path = "../rustc_mir_transform" }
[target.'cfg(unix)'.dependencies]
libc = "0.2"
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.48.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 e8bcd7c..36a5ee6 100644
--- a/compiler/rustc_errors/Cargo.toml
+++ b/compiler/rustc_errors/Cargo.toml
@@ -26,13 +26,5 @@ termize = "0.1.1"
serde = { version = "1.0.125", features = [ "derive" ] }
serde_json = "1.0.59"
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_Security",
- "Win32_System_Threading",
-]
-
[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 1291d14..d9f8675 100644
--- a/compiler/rustc_session/Cargo.toml
+++ b/compiler/rustc_session/Cargo.toml
@@ -25,10 +25,3 @@ termize = "0.1.1"
[target.'cfg(unix)'.dependencies]
libc = "0.2"
-
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_System_LibraryLoader",
-]
diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml
index cff2c9e..ad053f0 100644
--- a/library/backtrace/Cargo.toml
+++ b/library/backtrace/Cargo.toml
@@ -45,9 +45,6 @@ version = "0.31.1"
default-features = false
features = ['read_core', 'elf', 'macho', 'pe', '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
@@ -85,16 +82,6 @@ libbacktrace = []
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',
]
[[example]]
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index 85eb543..cf21349 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -62,21 +62,6 @@ semver = "1.0.17"
[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_System_Diagnostics_Debug",
- "Win32_System_JobObjects",
- "Win32_System_ProcessStatus",
- "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 384fe45..7ed3853 100644
--- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml
@@ -2,7 +2,9 @@
resolver = "2"
members = [
"crates/*",
- "credential/*",
+ "credential/cargo-credential",
+ "credential/cargo-credential-1password",
+ "credential/cargo-credential-gnome-secret",
"benches/benchsuite",
"benches/capture",
]
@@ -91,7 +93,6 @@ unicode-xid = "0.2.0"
url = "2.2.2"
varisat = "0.2.1"
walkdir = "2.3.1"
-windows-sys = "0.48"
[package]
name = "cargo"
@@ -174,19 +175,6 @@ walkdir.workspace = true
[target.'cfg(not(windows))'.dependencies]
openssl = { workspace = true, optional = true }
-[target.'cfg(windows)'.dependencies]
-fwdansi.workspace = true
-
-[target.'cfg(windows)'.dependencies.windows-sys]
-workspace = true
-features = [
- "Win32_Foundation",
- "Win32_Storage_FileSystem",
- "Win32_System_Console",
- "Win32_System_Threading",
- "Win32_System_JobObjects",
-]
-
[dev-dependencies]
cargo-test-macro.workspace = true
cargo-test-support.workspace = true
diff --git a/src/tools/cargo/crates/cargo-test-support/Cargo.toml b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
index 305c809a..c656678 100644
--- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
@@ -9,25 +9,22 @@ publish = false
doctest = false
[dependencies]
-anyhow.workspace = true
-cargo-test-macro.workspace = true
-cargo-util.workspace = true
-crates-io.workspace = true
-filetime.workspace = true
-flate2.workspace = true
-git2.workspace = true
-glob.workspace = true
-itertools.workspace = true
-lazy_static.workspace = true
-pasetors.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_json.workspace = true
-snapbox.workspace = true
-tar.workspace = true
-termcolor.workspace = true
-time.workspace = true
-toml.workspace = true
-url.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] }
+anyhow = "1.0.34"
+cargo-test-macro = { path = "../cargo-test-macro" }
+cargo-util = { path = "../cargo-util" }
+crates-io = { path = "../crates-io" }
+filetime = "0.2"
+flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+git2 = "0.17.0"
+glob = "0.3"
+itertools = "0.10.0"
+lazy_static = "1.0"
+pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
+serde = { version = "1.0.123", features = ["derive"] }
+serde_json = "1.0"
+snapbox = { version = "0.4.0", features = ["diff", "path"] }
+tar = { version = "0.4.38", default-features = false }
+termcolor = "1.1.2"
+time = { version = "0.3", features = ["parsing", "formatting"]}
+toml = "0.7.0"
+url = "2.2.2"
diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml
index 6145810..46af186 100644
--- a/src/tools/cargo/crates/cargo-util/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-util/Cargo.toml
@@ -19,10 +19,3 @@ same-file.workspace = true
shell-escape.workspace = true
tempfile.workspace = true
walkdir.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-miow.workspace = true
-windows-sys = { workspace = true, 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 6c65ecc1..11fd255 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 = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell"] }
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
index d2f2583..61f7be4 100644
--- a/src/tools/compiletest/Cargo.toml
+++ b/src/tools/compiletest/Cargo.toml
@@ -27,13 +27,3 @@ anyhow = "1"
[target.'cfg(unix)'.dependencies]
libc = "0.2"
-
-[target.'cfg(windows)'.dependencies]
-miow = "0.5"
-
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_System_Diagnostics_Debug",
-]
diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
index 5faecc5..0d39d3b 100644
--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
@@ -21,9 +21,6 @@ countme = { version = "3.0.1", features = ["enable"] }
[target.'cfg(target_os = "linux")'.dependencies]
perf-event = "=0.4.7"
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
-
[features]
cpu_profiler = []
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
index 5b72d57..df53f34 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
@@ -77,12 +77,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"
xshell = "0.2.2"
diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
index a67f36a..bfbd00f 100644
--- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
@@ -19,10 +19,6 @@ jod-thread = "0.1.2"
crossbeam-channel = "0.5.5"
# 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" ]
|
