diff options
| author | bors <bors@rust-lang.org> | 2021-10-11 01:06:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-11 01:06:26 +0000 |
| commit | 1ddd4e6d7ed446934abd428a08e18535faef5e03 (patch) | |
| tree | 4bcf48eb7610041f34b158d395aacfbaf6aeee04 /library/std/src/sys/windows/stack_overflow.rs | |
| parent | 3bf55753c680e653eaa9d11dd66e56844bd04d32 (diff) | |
| parent | bf01a59be58cb1a2e9c37766762a3aedc575d346 (diff) | |
| download | rust-1ddd4e6d7ed446934abd428a08e18535faef5e03.tar.gz rust-1ddd4e6d7ed446934abd428a08e18535faef5e03.zip | |
Auto merge of #89752 - matthiaskrgr:rollup-v4fgmwg, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #89579 (Add regression test for issue 80108) - #89632 (Fix docblock code display on mobile) - #89691 (Move `DebuggerCommands` and `check_debugger_output` to a separate module) - #89707 (Apply clippy suggestions for std) - #89722 (Fix spelling: Cannonical -> Canonical) - #89736 (Remove unused CSS rule) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/windows/stack_overflow.rs')
| -rw-r--r-- | library/std/src/sys/windows/stack_overflow.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/std/src/sys/windows/stack_overflow.rs b/library/std/src/sys/windows/stack_overflow.rs index 755dc0a6c8b..18a2a36ad25 100644 --- a/library/std/src/sys/windows/stack_overflow.rs +++ b/library/std/src/sys/windows/stack_overflow.rs @@ -9,10 +9,10 @@ impl Handler { pub unsafe fn new() -> Handler { // This API isn't available on XP, so don't panic in that case and just // pray it works out ok. - if c::SetThreadStackGuarantee(&mut 0x5000) == 0 { - if c::GetLastError() as u32 != c::ERROR_CALL_NOT_IMPLEMENTED as u32 { - panic!("failed to reserve stack space for exception handling"); - } + if c::SetThreadStackGuarantee(&mut 0x5000) == 0 + && c::GetLastError() as u32 != c::ERROR_CALL_NOT_IMPLEMENTED as u32 + { + panic!("failed to reserve stack space for exception handling"); } Handler } |
