Skip to content

Commit d55f404

Browse files
klensyklensy
committed
bumpt compiler and tools to windows 0.59
1 parent e491cae commit d55f404

File tree

10 files changed

+148
-22
lines changed

10 files changed

+148
-22
lines changed

‎Cargo.lock

+138-11
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ dependencies = [
733733
"tracing-subscriber",
734734
"unified-diff",
735735
"walkdir",
736-
"windows",
736+
"windows 0.59.0",
737737
]
738738

739739
[[package]]
@@ -3573,7 +3573,7 @@ dependencies = [
35733573
"thorin-dwp",
35743574
"tracing",
35753575
"wasm-encoder 0.219.1",
3576-
"windows",
3576+
"windows 0.59.0",
35773577
]
35783578

35793579
[[package]]
@@ -3631,7 +3631,7 @@ dependencies = [
36313631
"tempfile",
36323632
"thin-vec",
36333633
"tracing",
3634-
"windows",
3634+
"windows 0.59.0",
36353635
]
36363636

36373637
[[package]]
@@ -3693,7 +3693,7 @@ dependencies = [
36933693
"shlex",
36943694
"time",
36953695
"tracing",
3696-
"windows",
3696+
"windows 0.59.0",
36973697
]
36983698

36993699
[[package]]
@@ -3746,7 +3746,7 @@ dependencies = [
37463746
"termcolor",
37473747
"termize",
37483748
"tracing",
3749-
"windows",
3749+
"windows 0.59.0",
37503750
]
37513751

37523752
[[package]]
@@ -4478,7 +4478,7 @@ dependencies = [
44784478
"smallvec",
44794479
"termize",
44804480
"tracing",
4481-
"windows",
4481+
"windows 0.59.0",
44824482
]
44834483

44844484
[[package]]
@@ -5175,7 +5175,7 @@ checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
51755175
dependencies = [
51765176
"core-foundation-sys",
51775177
"libc",
5178-
"windows",
5178+
"windows 0.57.0",
51795179
]
51805180

51815181
[[package]]
@@ -6090,6 +6090,16 @@ dependencies = [
60906090
"windows-targets 0.52.6",
60916091
]
60926092

6093+
[[package]]
6094+
name = "windows"
6095+
version = "0.59.0"
6096+
source = "registry+https://github.com/rust-lang/crates.io-index"
6097+
checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1"
6098+
dependencies = [
6099+
"windows-core 0.59.0",
6100+
"windows-targets 0.53.0",
6101+
]
6102+
60936103
[[package]]
60946104
name = "windows-bindgen"
60956105
version = "0.58.0"
@@ -6119,12 +6129,25 @@ version = "0.57.0"
61196129
source = "registry+https://github.com/rust-lang/crates.io-index"
61206130
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
61216131
dependencies = [
6122-
"windows-implement",
6123-
"windows-interface",
6124-
"windows-result",
6132+
"windows-implement 0.57.0",
6133+
"windows-interface 0.57.0",
6134+
"windows-result 0.1.2",
61256135
"windows-targets 0.52.6",
61266136
]
61276137

6138+
[[package]]
6139+
name = "windows-core"
6140+
version = "0.59.0"
6141+
source = "registry+https://github.com/rust-lang/crates.io-index"
6142+
checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce"
6143+
dependencies = [
6144+
"windows-implement 0.59.0",
6145+
"windows-interface 0.59.0",
6146+
"windows-result 0.3.0",
6147+
"windows-strings",
6148+
"windows-targets 0.53.0",
6149+
]
6150+
61286151
[[package]]
61296152
name = "windows-implement"
61306153
version = "0.57.0"
@@ -6136,6 +6159,17 @@ dependencies = [
61366159
"syn 2.0.94",
61376160
]
61386161

6162+
[[package]]
6163+
name = "windows-implement"
6164+
version = "0.59.0"
6165+
source = "registry+https://github.com/rust-lang/crates.io-index"
6166+
checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
6167+
dependencies = [
6168+
"proc-macro2",
6169+
"quote",
6170+
"syn 2.0.94",
6171+
]
6172+
61396173
[[package]]
61406174
name = "windows-interface"
61416175
version = "0.57.0"
@@ -6147,6 +6181,17 @@ dependencies = [
61476181
"syn 2.0.94",
61486182
]
61496183

6184+
[[package]]
6185+
name = "windows-interface"
6186+
version = "0.59.0"
6187+
source = "registry+https://github.com/rust-lang/crates.io-index"
6188+
checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
6189+
dependencies = [
6190+
"proc-macro2",
6191+
"quote",
6192+
"syn 2.0.94",
6193+
]
6194+
61506195
[[package]]
61516196
name = "windows-metadata"
61526197
version = "0.58.0"
@@ -6162,6 +6207,24 @@ dependencies = [
61626207
"windows-targets 0.52.6",
61636208
]
61646209

6210+
[[package]]
6211+
name = "windows-result"
6212+
version = "0.3.0"
6213+
source = "registry+https://github.com/rust-lang/crates.io-index"
6214+
checksum = "d08106ce80268c4067c0571ca55a9b4e9516518eaa1a1fe9b37ca403ae1d1a34"
6215+
dependencies = [
6216+
"windows-targets 0.53.0",
6217+
]
6218+
6219+
[[package]]
6220+
name = "windows-strings"
6221+
version = "0.3.0"
6222+
source = "registry+https://github.com/rust-lang/crates.io-index"
6223+
checksum = "b888f919960b42ea4e11c2f408fadb55f78a9f236d5eef084103c8ce52893491"
6224+
dependencies = [
6225+
"windows-targets 0.53.0",
6226+
]
6227+
61656228
[[package]]
61666229
name = "windows-sys"
61676230
version = "0.48.0"
@@ -6213,13 +6276,29 @@ dependencies = [
62136276
"windows_aarch64_gnullvm 0.52.6",
62146277
"windows_aarch64_msvc 0.52.6",
62156278
"windows_i686_gnu 0.52.6",
6216-
"windows_i686_gnullvm",
6279+
"windows_i686_gnullvm 0.52.6",
62176280
"windows_i686_msvc 0.52.6",
62186281
"windows_x86_64_gnu 0.52.6",
62196282
"windows_x86_64_gnullvm 0.52.6",
62206283
"windows_x86_64_msvc 0.52.6",
62216284
]
62226285

6286+
[[package]]
6287+
name = "windows-targets"
6288+
version = "0.53.0"
6289+
source = "registry+https://github.com/rust-lang/crates.io-index"
6290+
checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
6291+
dependencies = [
6292+
"windows_aarch64_gnullvm 0.53.0",
6293+
"windows_aarch64_msvc 0.53.0",
6294+
"windows_i686_gnu 0.53.0",
6295+
"windows_i686_gnullvm 0.53.0",
6296+
"windows_i686_msvc 0.53.0",
6297+
"windows_x86_64_gnu 0.53.0",
6298+
"windows_x86_64_gnullvm 0.53.0",
6299+
"windows_x86_64_msvc 0.53.0",
6300+
]
6301+
62236302
[[package]]
62246303
name = "windows_aarch64_gnullvm"
62256304
version = "0.48.5"
@@ -6232,6 +6311,12 @@ version = "0.52.6"
62326311
source = "registry+https://github.com/rust-lang/crates.io-index"
62336312
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
62346313

6314+
[[package]]
6315+
name = "windows_aarch64_gnullvm"
6316+
version = "0.53.0"
6317+
source = "registry+https://github.com/rust-lang/crates.io-index"
6318+
checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
6319+
62356320
[[package]]
62366321
name = "windows_aarch64_msvc"
62376322
version = "0.48.5"
@@ -6244,6 +6329,12 @@ version = "0.52.6"
62446329
source = "registry+https://github.com/rust-lang/crates.io-index"
62456330
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
62466331

6332+
[[package]]
6333+
name = "windows_aarch64_msvc"
6334+
version = "0.53.0"
6335+
source = "registry+https://github.com/rust-lang/crates.io-index"
6336+
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
6337+
62476338
[[package]]
62486339
name = "windows_i686_gnu"
62496340
version = "0.48.5"
@@ -6256,12 +6347,24 @@ version = "0.52.6"
62566347
source = "registry+https://github.com/rust-lang/crates.io-index"
62576348
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
62586349

6350+
[[package]]
6351+
name = "windows_i686_gnu"
6352+
version = "0.53.0"
6353+
source = "registry+https://github.com/rust-lang/crates.io-index"
6354+
checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
6355+
62596356
[[package]]
62606357
name = "windows_i686_gnullvm"
62616358
version = "0.52.6"
62626359
source = "registry+https://github.com/rust-lang/crates.io-index"
62636360
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
62646361

6362+
[[package]]
6363+
name = "windows_i686_gnullvm"
6364+
version = "0.53.0"
6365+
source = "registry+https://github.com/rust-lang/crates.io-index"
6366+
checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
6367+
62656368
[[package]]
62666369
name = "windows_i686_msvc"
62676370
version = "0.48.5"
@@ -6274,6 +6377,12 @@ version = "0.52.6"
62746377
source = "registry+https://github.com/rust-lang/crates.io-index"
62756378
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
62766379

6380+
[[package]]
6381+
name = "windows_i686_msvc"
6382+
version = "0.53.0"
6383+
source = "registry+https://github.com/rust-lang/crates.io-index"
6384+
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
6385+
62776386
[[package]]
62786387
name = "windows_x86_64_gnu"
62796388
version = "0.48.5"
@@ -6286,6 +6395,12 @@ version = "0.52.6"
62866395
source = "registry+https://github.com/rust-lang/crates.io-index"
62876396
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
62886397

6398+
[[package]]
6399+
name = "windows_x86_64_gnu"
6400+
version = "0.53.0"
6401+
source = "registry+https://github.com/rust-lang/crates.io-index"
6402+
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
6403+
62896404
[[package]]
62906405
name = "windows_x86_64_gnullvm"
62916406
version = "0.48.5"
@@ -6298,6 +6413,12 @@ version = "0.52.6"
62986413
source = "registry+https://github.com/rust-lang/crates.io-index"
62996414
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
63006415

6416+
[[package]]
6417+
name = "windows_x86_64_gnullvm"
6418+
version = "0.53.0"
6419+
source = "registry+https://github.com/rust-lang/crates.io-index"
6420+
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
6421+
63016422
[[package]]
63026423
name = "windows_x86_64_msvc"
63036424
version = "0.48.5"
@@ -6310,6 +6431,12 @@ version = "0.52.6"
63106431
source = "registry+https://github.com/rust-lang/crates.io-index"
63116432
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
63126433

6434+
[[package]]
6435+
name = "windows_x86_64_msvc"
6436+
version = "0.53.0"
6437+
source = "registry+https://github.com/rust-lang/crates.io-index"
6438+
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
6439+
63136440
[[package]]
63146441
name = "winnow"
63156442
version = "0.5.40"

‎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"]

‎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",

‎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,

‎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
]

‎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",

‎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",

‎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
}

‎src/tools/compiletest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ libc = "0.2"
3434
miow = "0.6"
3535

3636
[target.'cfg(windows)'.dependencies.windows]
37-
version = "0.57.0"
37+
version = "0.59.0"
3838
features = [
3939
"Win32_Foundation",
4040
"Win32_System_Diagnostics_Debug",

‎src/tools/compiletest/src/runtest.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R {
5959
use std::sync::Mutex;
6060

6161
use windows::Win32::System::Diagnostics::Debug::{
62-
SEM_FAILCRITICALERRORS, SEM_NOGPFAULTERRORBOX, SetErrorMode, THREAD_ERROR_MODE,
62+
SEM_FAILCRITICALERRORS, SEM_NOGPFAULTERRORBOX, SetErrorMode,
6363
};
6464

6565
static LOCK: Mutex<()> = Mutex::new(());
@@ -80,7 +80,6 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R {
8080
unsafe {
8181
// read inherited flags
8282
let old_mode = SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS);
83-
let old_mode = THREAD_ERROR_MODE(old_mode);
8483
SetErrorMode(old_mode | SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS);
8584
let r = f();
8685
SetErrorMode(old_mode);

0 commit comments

Comments
 (0)