diff options
| author | klensy <klensy@users.noreply.github.com> | 2025-01-14 16:57:04 +0300 |
|---|---|---|
| committer | klensy <klensy@users.noreply.github.com> | 2025-01-21 16:48:44 +0300 |
| commit | 84ce2e129a5b6a5af2f2ea27af5ad907a1aac419 (patch) | |
| tree | bd876363dcfe4b514eec8090e01edd8c3d8f1bdc /src | |
| parent | ebbe63891f1fae21734cb97f2f863b08b1d44bf8 (diff) | |
| download | rust-84ce2e129a5b6a5af2f2ea27af5ad907a1aac419.tar.gz rust-84ce2e129a5b6a5af2f2ea27af5ad907a1aac419.zip | |
bumpt compiler and tools to windows 0.59
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 16cc1d2a565..4f8e475e762 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -34,7 +34,7 @@ libc = "0.2" miow = "0.6" [target.'cfg(windows)'.dependencies.windows] -version = "0.57.0" +version = "0.59.0" features = [ "Win32_Foundation", "Win32_System_Diagnostics_Debug", diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 84f2149dbdf..ca48abda5fc 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -59,7 +59,7 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R { use std::sync::Mutex; use windows::Win32::System::Diagnostics::Debug::{ - SEM_FAILCRITICALERRORS, SEM_NOGPFAULTERRORBOX, SetErrorMode, THREAD_ERROR_MODE, + SEM_FAILCRITICALERRORS, SEM_NOGPFAULTERRORBOX, SetErrorMode, }; static LOCK: Mutex<()> = Mutex::new(()); @@ -80,7 +80,6 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R { unsafe { // read inherited flags let old_mode = SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS); - let old_mode = THREAD_ERROR_MODE(old_mode); SetErrorMode(old_mode | SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS); let r = f(); SetErrorMode(old_mode); |