diff options
| author | bors <bors@rust-lang.org> | 2024-07-15 10:57:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-15 10:57:49 +0000 |
| commit | d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee (patch) | |
| tree | bd23bcd2ad1cdb90b447fb16e6a4679dbda900d0 /library/std/src/sys/pal/windows/stack_overflow.rs | |
| parent | adeb79d3f523dfc11a8e9db64ddfc5f546f650bb (diff) | |
| parent | 476d399782a27df846e1ace578a2e89f70a13d42 (diff) | |
| download | rust-d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee.tar.gz rust-d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee.zip | |
Auto merge of #127757 - workingjubilee:rollup-4dbks5r, r=workingjubilee
Rollup of 3 pull requests Successful merges: - #127712 (Windows: Remove some unnecessary type aliases) - #127744 (std: `#![deny(unsafe_op_in_unsafe_fn)]` in platform-independent code) - #127750 (Make os/windows and pal/windows default to `#![deny(unsafe_op_in_unsafe_fn)]`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/pal/windows/stack_overflow.rs')
| -rw-r--r-- | library/std/src/sys/pal/windows/stack_overflow.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/library/std/src/sys/pal/windows/stack_overflow.rs b/library/std/src/sys/pal/windows/stack_overflow.rs index f93f31026f8..ea89429cb83 100644 --- a/library/std/src/sys/pal/windows/stack_overflow.rs +++ b/library/std/src/sys/pal/windows/stack_overflow.rs @@ -1,4 +1,5 @@ #![cfg_attr(test, allow(dead_code))] +#![allow(unsafe_op_in_unsafe_fn)] use crate::sys::c; use crate::thread; @@ -11,7 +12,7 @@ pub unsafe fn reserve_stack() { debug_assert_ne!(result, 0, "failed to reserve stack space for exception handling"); } -unsafe extern "system" fn vectored_handler(ExceptionInfo: *mut c::EXCEPTION_POINTERS) -> c::LONG { +unsafe extern "system" fn vectored_handler(ExceptionInfo: *mut c::EXCEPTION_POINTERS) -> i32 { unsafe { let rec = &(*(*ExceptionInfo).ExceptionRecord); let code = rec.ExceptionCode; |