Skip to content

Commit 9b9ea35

Browse files
committed
Auto merge of rust-lang#132326 - matthiaskrgr:rollup-ngyw18g, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#131984 (Stabilize if_let_rescope) - rust-lang#132151 (Ensure that resume arg outlives region bound for coroutines) - rust-lang#132157 (Remove detail from label/note that is already available in other note) - rust-lang#132274 (Cleanup op lookup in HIR typeck) - rust-lang#132319 (cg_llvm: Clean up FFI calls for setting module flags) - rust-lang#132321 (xous: sync: remove `rustc_const_stable` attribute on Condvar and Mutex new()) r? `@ghost` `@rustbot` modify labels: rollup
2 parents eb2e420 + 94dd5c6 commit 9b9ea35

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

std/src/sys/sync/condvar/xous.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ unsafe impl Sync for Condvar {}
2020

2121
impl Condvar {
2222
#[inline]
23-
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
2423
pub const fn new() -> Condvar {
2524
Condvar { counter: AtomicUsize::new(0), timed_out: AtomicUsize::new(0) }
2625
}

std/src/sys/sync/mutex/xous.rs

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pub struct Mutex {
2424

2525
impl Mutex {
2626
#[inline]
27-
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
2827
pub const fn new() -> Mutex {
2928
Mutex { locked: AtomicUsize::new(0), contended: AtomicBool::new(false) }
3029
}

0 commit comments

Comments
 (0)