diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-10-29 18:39:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-29 18:39:00 +0100 |
| commit | 07afe8d12f1c72bdc46f052088922943ca91bcdd (patch) | |
| tree | e1978ec4123ab22b53cad07919687515f363264f | |
| parent | 2707cd670c2d3ea4742d3b447d5e09d872161c5a (diff) | |
| parent | 59944c9c9f975f874565a1817d1ea005480a5e67 (diff) | |
| download | rust-07afe8d12f1c72bdc46f052088922943ca91bcdd.tar.gz rust-07afe8d12f1c72bdc46f052088922943ca91bcdd.zip | |
Rollup merge of #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.
| -rw-r--r-- | library/std/src/sys/sync/condvar/xous.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/sync/mutex/xous.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/library/std/src/sys/sync/condvar/xous.rs b/library/std/src/sys/sync/condvar/xous.rs index cb55a3e3369..b9e5f47abfc 100644 --- a/library/std/src/sys/sync/condvar/xous.rs +++ b/library/std/src/sys/sync/condvar/xous.rs @@ -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) } } diff --git a/library/std/src/sys/sync/mutex/xous.rs b/library/std/src/sys/sync/mutex/xous.rs index 233e638f913..c6b954c1711 100644 --- a/library/std/src/sys/sync/mutex/xous.rs +++ b/library/std/src/sys/sync/mutex/xous.rs @@ -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) } } |