Skip to content

Commit

Permalink
Unrolled build for rust-lang#132321
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#132321 - betrusted-io:xous/fix-rustc_const_stable-attribute, r=joboet

xous: sync: remove `rustc_const_stable` attribute on Condvar and Mutex new()

These functions had `#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]` on them because they were originally taken from `no_threads`. with d066dfd these no longer compile. Since other platforms do not have this attribute, remove it. This fixes the build for Xous.
  • Loading branch information
rust-timer authored Oct 29, 2024
2 parents e473783 + 59944c9 commit 2a82a4c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion library/std/src/sys/sync/condvar/xous.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ unsafe impl Sync for Condvar {}

impl Condvar {
#[inline]
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
pub const fn new() -> Condvar {
Condvar { counter: AtomicUsize::new(0), timed_out: AtomicUsize::new(0) }
}
Expand Down
1 change: 0 additions & 1 deletion library/std/src/sys/sync/mutex/xous.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ pub struct Mutex {

impl Mutex {
#[inline]
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
pub const fn new() -> Mutex {
Mutex { locked: AtomicUsize::new(0), contended: AtomicBool::new(false) }
}
Expand Down

0 comments on commit 2a82a4c

Please sign in to comment.