diff options
| author | bors <bors@rust-lang.org> | 2024-10-29 19:25:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-29 19:25:03 +0000 |
| commit | 1e4f10ba6476e48a42a79b9f846a2d9366525b9e (patch) | |
| tree | 66c68bd54e4c3891de7c37e48c563a9b79177192 /library/std/src | |
| parent | e473783d90e2289b8a97575fa60d6315f0a318eb (diff) | |
| parent | 07afe8d12f1c72bdc46f052088922943ca91bcdd (diff) | |
| download | rust-1e4f10ba6476e48a42a79b9f846a2d9366525b9e.tar.gz rust-1e4f10ba6476e48a42a79b9f846a2d9366525b9e.zip | |
Auto merge of #132326 - matthiaskrgr:rollup-ngyw18g, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #131984 (Stabilize if_let_rescope) - #132151 (Ensure that resume arg outlives region bound for coroutines) - #132157 (Remove detail from label/note that is already available in other note) - #132274 (Cleanup op lookup in HIR typeck) - #132319 (cg_llvm: Clean up FFI calls for setting module flags) - #132321 (xous: sync: remove `rustc_const_stable` attribute on Condvar and Mutex new()) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -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) } } |