mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132321 - betrusted-io:xous/fix-rustc_const_stable-attribute, r=joboet

Browse Source 
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.
This commit is contained in:
Matthias Krüger 2024-10-29 18:39:00 +01:00 committed by GitHub
commit 07afe8d12f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/std/src/sys/sync/condvar/xous.rs
View File

@ -20,7 +20,6 @@ unsafe impl Sync for Condvar {}
impl Condvar { impl Condvar {
#[inline] #[inline]
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
pub const fn new() -> Condvar { pub const fn new() -> Condvar {
Condvar { counter: AtomicUsize::new(0), timed_out: AtomicUsize::new(0) } Condvar { counter: AtomicUsize::new(0), timed_out: AtomicUsize::new(0) }
} }

1
library/std/src/sys/sync/mutex/xous.rs
View File

@ -24,7 +24,6 @@ pub struct Mutex {
impl Mutex { impl Mutex {
#[inline] #[inline]
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
pub const fn new() -> Mutex { pub const fn new() -> Mutex {
Mutex { locked: AtomicUsize::new(0), contended: AtomicBool::new(false) } Mutex { locked: AtomicUsize::new(0), contended: AtomicBool::new(false) }
} }