diff options
| author | bors <bors@rust-lang.org> | 2024-10-08 11:27:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-08 11:27:18 +0000 |
| commit | 84a16c49d4c23a3c2c16d058ce542ca52e07112a (patch) | |
| tree | 9d5b39941405bec4b7c4571606df8b88850325e9 /library/std/src/sys/pal/unix/stack_overflow.rs | |
| parent | 76fc27a178d999358ac2105b8868cc8a45a2513f (diff) | |
| parent | 4316afffd9390bdac1d3bd5e5398c65d6e9bb150 (diff) | |
| download | rust-84a16c49d4c23a3c2c16d058ce542ca52e07112a.tar.gz rust-84a16c49d4c23a3c2c16d058ce542ca52e07112a.zip | |
Auto merge of #18267 - lnicola:sync-from-rust, r=lnicola
minor: Sync from downstream
Diffstat (limited to 'library/std/src/sys/pal/unix/stack_overflow.rs')
| -rw-r--r-- | library/std/src/sys/pal/unix/stack_overflow.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/unix/stack_overflow.rs b/library/std/src/sys/pal/unix/stack_overflow.rs index e0a0d0973c6..ac0858e1de8 100644 --- a/library/std/src/sys/pal/unix/stack_overflow.rs +++ b/library/std/src/sys/pal/unix/stack_overflow.rs @@ -426,8 +426,8 @@ mod imp { match sysctlbyname.get() { Some(fcn) if unsafe { fcn(oid.as_ptr(), - ptr::addr_of_mut!(guard).cast(), - ptr::addr_of_mut!(size), + (&raw mut guard).cast(), + &raw mut size, ptr::null_mut(), 0) == 0 } => guard, |