Skip to content

Commit

Permalink
Rollup merge of rust-lang#108507 - hermitcore:new, r=m-ou-se
Browse files Browse the repository at this point in the history
use `as_ptr` to determine the address of atomics

The PR rust-lang#107736 renamed  atomic `as_mut_ptr` to `as_ptr`. Consequently, the futex implementation of the tier-3 platform `RutyHermit` has to use this new interface. In addition, this PR removes also an unused import.
  • Loading branch information
matthiaskrgr authored Mar 13, 2023
2 parents 1666418 + ae27762 commit bded0f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions library/std/src/sys/hermit/futex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub fn futex_wait(futex: &AtomicU32, expected: u32, timeout: Option<Duration>) -

let r = unsafe {
abi::futex_wait(
futex.as_mut_ptr(),
futex.as_ptr(),
expected,
timespec.as_ref().map_or(null(), |t| t as *const abi::timespec),
abi::FUTEX_RELATIVE_TIMEOUT,
Expand All @@ -28,12 +28,12 @@ pub fn futex_wait(futex: &AtomicU32, expected: u32, timeout: Option<Duration>) -

#[inline]
pub fn futex_wake(futex: &AtomicU32) -> bool {
unsafe { abi::futex_wake(futex.as_mut_ptr(), 1) > 0 }
unsafe { abi::futex_wake(futex.as_ptr(), 1) > 0 }
}

#[inline]
pub fn futex_wake_all(futex: &AtomicU32) {
unsafe {
abi::futex_wake(futex.as_mut_ptr(), i32::MAX);
abi::futex_wake(futex.as_ptr(), i32::MAX);
}
}
1 change: 0 additions & 1 deletion library/std/src/sys/hermit/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#![allow(missing_docs, nonstandard_style, unsafe_op_in_unsafe_fn)]

use crate::intrinsics;
use crate::os::raw::c_char;

pub mod alloc;
Expand Down

0 comments on commit bded0f1

Please sign in to comment.