Skip to content

Commit a24bdc6

Browse files
borsbors
committed
Auto merge of rust-lang#135487 - klensy:windows-0.59, r=Mark-Simulacrum
bump compiler and tools to windows 0.59, bootstrap to 0.57 This bumps compiler and tools to windows 0.59 (temporary dupes version, as `sysinfo` still depend on <= 0.57). Bootstrap bumps only to 0.57 (the same sysinfo dep). This additionally resolves my comment rust-lang#130874 (comment) Will work on it in follow up pr: There still some sus imports for `rustc_driver.dll` like ws2_32 or RoOriginateErrorW, but i will look at them later.
2 parents ed43cbc + 6c5f084 commit a24bdc6

File tree

13 files changed

+153
-45
lines changed

13 files changed

+153
-45
lines changed

Diff for: ‎Cargo.lock

+138-11
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ dependencies = [
734734
"tracing-subscriber",
735735
"unified-diff",
736736
"walkdir",
737-
"windows",
737+
"windows 0.59.0",
738738
]
739739

740740
[[package]]
@@ -3575,7 +3575,7 @@ dependencies = [
35753575
"thorin-dwp",
35763576
"tracing",
35773577
"wasm-encoder 0.219.1",
3578-
"windows",
3578+
"windows 0.59.0",
35793579
]
35803580

35813581
[[package]]
@@ -3633,7 +3633,7 @@ dependencies = [
36333633
"tempfile",
36343634
"thin-vec",
36353635
"tracing",
3636-
"windows",
3636+
"windows 0.59.0",
36373637
]
36383638

36393639
[[package]]
@@ -3695,7 +3695,7 @@ dependencies = [
36953695
"shlex",
36963696
"time",
36973697
"tracing",
3698-
"windows",
3698+
"windows 0.59.0",
36993699
]
37003700

37013701
[[package]]
@@ -3748,7 +3748,7 @@ dependencies = [
37483748
"termcolor",
37493749
"termize",
37503750
"tracing",
3751-
"windows",
3751+
"windows 0.59.0",
37523752
]
37533753

37543754
[[package]]
@@ -4481,7 +4481,7 @@ dependencies = [
44814481
"smallvec",
44824482
"termize",
44834483
"tracing",
4484-
"windows",
4484+
"windows 0.59.0",
44854485
]
44864486

44874487
[[package]]
@@ -5184,7 +5184,7 @@ checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
51845184
dependencies = [
51855185
"core-foundation-sys",
51865186
"libc",
5187-
"windows",
5187+
"windows 0.57.0",
51885188
]
51895189

51905190
[[package]]
@@ -6112,6 +6112,16 @@ dependencies = [
61126112
"windows-targets 0.52.6",
61136113
]
61146114

6115+
[[package]]
6116+
name = "windows"
6117+
version = "0.59.0"
6118+
source = "registry+https://github.com/rust-lang/crates.io-index"
6119+
checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1"
6120+
dependencies = [
6121+
"windows-core 0.59.0",
6122+
"windows-targets 0.53.0",
6123+
]
6124+
61156125
[[package]]
61166126
name = "windows-bindgen"
61176127
version = "0.58.0"
@@ -6141,12 +6151,25 @@ version = "0.57.0"
61416151
source = "registry+https://github.com/rust-lang/crates.io-index"
61426152
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
61436153
dependencies = [
6144-
"windows-implement",
6145-
"windows-interface",
6146-
"windows-result",
6154+
"windows-implement 0.57.0",
6155+
"windows-interface 0.57.0",
6156+
"windows-result 0.1.2",
61476157
"windows-targets 0.52.6",
61486158
]
61496159

6160+
[[package]]
6161+
name = "windows-core"
6162+
version = "0.59.0"
6163+
source = "registry+https://github.com/rust-lang/crates.io-index"
6164+
checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce"
6165+
dependencies = [
6166+
"windows-implement 0.59.0",
6167+
"windows-interface 0.59.0",
6168+
"windows-result 0.3.0",
6169+
"windows-strings",
6170+
"windows-targets 0.53.0",
6171+
]
6172+
61506173
[[package]]
61516174
name = "windows-implement"
61526175
version = "0.57.0"
@@ -6158,6 +6181,17 @@ dependencies = [
61586181
"syn 2.0.96",
61596182
]
61606183

6184+
[[package]]
6185+
name = "windows-implement"
6186+
version = "0.59.0"
6187+
source = "registry+https://github.com/rust-lang/crates.io-index"
6188+
checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
6189+
dependencies = [
6190+
"proc-macro2",
6191+
"quote",
6192+
"syn 2.0.96",
6193+
]
6194+
61616195
[[package]]
61626196
name = "windows-interface"
61636197
version = "0.57.0"
@@ -6169,6 +6203,17 @@ dependencies = [
61696203
"syn 2.0.96",
61706204
]
61716205

6206+
[[package]]
6207+
name = "windows-interface"
6208+
version = "0.59.0"
6209+
source = "registry+https://github.com/rust-lang/crates.io-index"
6210+
checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
6211+
dependencies = [
6212+
"proc-macro2",
6213+
"quote",
6214+
"syn 2.0.96",
6215+
]
6216+
61726217
[[package]]
61736218
name = "windows-metadata"
61746219
version = "0.58.0"
@@ -6184,6 +6229,24 @@ dependencies = [
61846229
"windows-targets 0.52.6",
61856230
]
61866231

6232+
[[package]]
6233+
name = "windows-result"
6234+
version = "0.3.0"
6235+
source = "registry+https://github.com/rust-lang/crates.io-index"
6236+
checksum = "d08106ce80268c4067c0571ca55a9b4e9516518eaa1a1fe9b37ca403ae1d1a34"
6237+
dependencies = [
6238+
"windows-targets 0.53.0",
6239+
]
6240+
6241+
[[package]]
6242+
name = "windows-strings"
6243+
version = "0.3.0"
6244+
source = "registry+https://github.com/rust-lang/crates.io-index"
6245+
checksum = "b888f919960b42ea4e11c2f408fadb55f78a9f236d5eef084103c8ce52893491"
6246+
dependencies = [
6247+
"windows-targets 0.53.0",
6248+
]
6249+
61876250
[[package]]
61886251
name = "windows-sys"
61896252
version = "0.48.0"
@@ -6235,13 +6298,29 @@ dependencies = [
62356298
"windows_aarch64_gnullvm 0.52.6",
62366299
"windows_aarch64_msvc 0.52.6",
62376300
"windows_i686_gnu 0.52.6",
6238-
"windows_i686_gnullvm",
6301+
"windows_i686_gnullvm 0.52.6",
62396302
"windows_i686_msvc 0.52.6",
62406303
"windows_x86_64_gnu 0.52.6",
62416304
"windows_x86_64_gnullvm 0.52.6",
62426305
"windows_x86_64_msvc 0.52.6",
62436306
]
62446307

6308+
[[package]]
6309+
name = "windows-targets"
6310+
version = "0.53.0"
6311+
source = "registry+https://github.com/rust-lang/crates.io-index"
6312+
checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
6313+
dependencies = [
6314+
"windows_aarch64_gnullvm 0.53.0",
6315+
"windows_aarch64_msvc 0.53.0",
6316+
"windows_i686_gnu 0.53.0",
6317+
"windows_i686_gnullvm 0.53.0",
6318+
"windows_i686_msvc 0.53.0",
6319+
"windows_x86_64_gnu 0.53.0",
6320+
"windows_x86_64_gnullvm 0.53.0",
6321+
"windows_x86_64_msvc 0.53.0",
6322+
]
6323+
62456324
[[package]]
62466325
name = "windows_aarch64_gnullvm"
62476326
version = "0.48.5"
@@ -6254,6 +6333,12 @@ version = "0.52.6"
62546333
source = "registry+https://github.com/rust-lang/crates.io-index"
62556334
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
62566335

6336+
[[package]]
6337+
name = "windows_aarch64_gnullvm"
6338+
version = "0.53.0"
6339+
source = "registry+https://github.com/rust-lang/crates.io-index"
6340+
checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
6341+
62576342
[[package]]
62586343
name = "windows_aarch64_msvc"
62596344
version = "0.48.5"
@@ -6266,6 +6351,12 @@ version = "0.52.6"
62666351
source = "registry+https://github.com/rust-lang/crates.io-index"
62676352
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
62686353

6354+
[[package]]
6355+
name = "windows_aarch64_msvc"
6356+
version = "0.53.0"
6357+
source = "registry+https://github.com/rust-lang/crates.io-index"
6358+
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
6359+
62696360
[[package]]
62706361
name = "windows_i686_gnu"
62716362
version = "0.48.5"
@@ -6278,12 +6369,24 @@ version = "0.52.6"
62786369
source = "registry+https://github.com/rust-lang/crates.io-index"
62796370
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
62806371

6372+
[[package]]
6373+
name = "windows_i686_gnu"
6374+
version = "0.53.0"
6375+
source = "registry+https://github.com/rust-lang/crates.io-index"
6376+
checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
6377+
62816378
[[package]]
62826379
name = "windows_i686_gnullvm"
62836380
version = "0.52.6"
62846381
source = "registry+https://github.com/rust-lang/crates.io-index"
62856382
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
62866383

6384+
[[package]]
6385+
name = "windows_i686_gnullvm"
6386+
version = "0.53.0"
6387+
source = "registry+https://github.com/rust-lang/crates.io-index"
6388+
checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
6389+
62876390
[[package]]
62886391
name = "windows_i686_msvc"
62896392
version = "0.48.5"
@@ -6296,6 +6399,12 @@ version = "0.52.6"
62966399
source = "registry+https://github.com/rust-lang/crates.io-index"
62976400
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
62986401

6402+
[[package]]
6403+
name = "windows_i686_msvc"
6404+
version = "0.53.0"
6405+
source = "registry+https://github.com/rust-lang/crates.io-index"
6406+
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
6407+
62996408
[[package]]
63006409
name = "windows_x86_64_gnu"
63016410
version = "0.48.5"
@@ -6308,6 +6417,12 @@ version = "0.52.6"
63086417
source = "registry+https://github.com/rust-lang/crates.io-index"
63096418
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
63106419

6420+
[[package]]
6421+
name = "windows_x86_64_gnu"
6422+
version = "0.53.0"
6423+
source = "registry+https://github.com/rust-lang/crates.io-index"
6424+
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
6425+
63116426
[[package]]
63126427
name = "windows_x86_64_gnullvm"
63136428
version = "0.48.5"
@@ -6320,6 +6435,12 @@ version = "0.52.6"
63206435
source = "registry+https://github.com/rust-lang/crates.io-index"
63216436
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
63226437

6438+
[[package]]
6439+
name = "windows_x86_64_gnullvm"
6440+
version = "0.53.0"
6441+
source = "registry+https://github.com/rust-lang/crates.io-index"
6442+
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
6443+
63236444
[[package]]
63246445
name = "windows_x86_64_msvc"
63256446
version = "0.48.5"
@@ -6332,6 +6453,12 @@ version = "0.52.6"
63326453
source = "registry+https://github.com/rust-lang/crates.io-index"
63336454
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
63346455

6456+
[[package]]
6457+
name = "windows_x86_64_msvc"
6458+
version = "0.53.0"
6459+
source = "registry+https://github.com/rust-lang/crates.io-index"
6460+
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
6461+
63356462
[[package]]
63366463
name = "winnow"
63376464
version = "0.5.40"

Diff for: ‎compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ default-features = false
5959
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
6060

6161
[target.'cfg(windows)'.dependencies.windows]
62-
version = "0.57.0"
62+
version = "0.59.0"
6363
features = ["Win32_Globalization"]

Diff for: ‎compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tracing = "0.1"
3232
version = "0.12"
3333

3434
[target.'cfg(windows)'.dependencies.windows]
35-
version = "0.57.0"
35+
version = "0.59.0"
3636
features = [
3737
"Win32_Foundation",
3838
"Win32_Storage_FileSystem",

Diff for: ‎compiler/rustc_data_structures/src/flock/windows.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ impl Lock {
6060

6161
unsafe {
6262
LockFileEx(
63-
HANDLE(file.as_raw_handle() as isize),
63+
HANDLE(file.as_raw_handle()),
6464
flags,
65-
0,
65+
None,
6666
u32::MAX,
6767
u32::MAX,
6868
&mut overlapped,

Diff for: ‎compiler/rustc_driver_impl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ libc = "0.2"
5959
# tidy-alphabetical-end
6060

6161
[target.'cfg(windows)'.dependencies.windows]
62-
version = "0.57.0"
62+
version = "0.59.0"
6363
features = [
6464
"Win32_System_Diagnostics_Debug",
6565
]

Diff for: ‎compiler/rustc_errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ tracing = "0.1"
3131
# tidy-alphabetical-end
3232

3333
[target.'cfg(windows)'.dependencies.windows]
34-
version = "0.57.0"
34+
version = "0.59.0"
3535
features = [
3636
"Win32_Foundation",
3737
"Win32_Security",

Diff for: ‎compiler/rustc_session/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ libc = "0.2"
3131
# tidy-alphabetical-end
3232

3333
[target.'cfg(windows)'.dependencies.windows]
34-
version = "0.57.0"
34+
version = "0.59.0"
3535
features = [
3636
"Win32_Foundation",
3737
"Win32_System_LibraryLoader",

Diff for: ‎compiler/rustc_session/src/filesearch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ fn current_dll_path() -> Result<PathBuf, String> {
145145
.map_err(|e| e.to_string())?;
146146

147147
let mut filename = vec![0; 1024];
148-
let n = unsafe { GetModuleFileNameW(module, &mut filename) } as usize;
148+
let n = unsafe { GetModuleFileNameW(Some(module), &mut filename) } as usize;
149149
if n == 0 {
150150
return Err(format!("GetModuleFileNameW failed: {}", io::Error::last_os_error()));
151151
}

0 commit comments

Comments
 (0)