Skip to content

Commit b0248e2

Browse files
committed
Auto merge of rust-lang#132145 - RalfJung:stdarch, r=Amanieu
bump stdarch This lets us remove a hack from rust-lang#131349. r? `@Amanieu` try-job: test-various
2 parents 8cdb783 + 4f4a6c6 commit b0248e2

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub struct Condvar {}
55

66
impl Condvar {
77
#[inline]
8-
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
8+
#[cfg_attr(bootstrap, rustc_const_stable(feature = "const_locks", since = "1.63.0"))]
99
pub const fn new() -> Condvar {
1010
Condvar {}
1111
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ unsafe impl Sync for Mutex {} // no threads on this platform
1010

1111
impl Mutex {
1212
#[inline]
13-
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
13+
#[cfg_attr(bootstrap, rustc_const_stable(feature = "const_locks", since = "1.63.0"))]
1414
pub const fn new() -> Mutex {
1515
Mutex { locked: Cell::new(false) }
1616
}

std/src/sys/sync/once/no_threads.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ unsafe impl Sync for Once {}
3535

3636
impl Once {
3737
#[inline]
38-
#[rustc_const_stable(feature = "const_once_new", since = "1.32.0")]
38+
#[cfg_attr(bootstrap, rustc_const_stable(feature = "const_once_new", since = "1.32.0"))]
3939
pub const fn new() -> Once {
4040
Once { state: Cell::new(State::Incomplete) }
4141
}

std/src/sys/sync/rwlock/no_threads.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ unsafe impl Sync for RwLock {} // no threads on this platform
1010

1111
impl RwLock {
1212
#[inline]
13-
#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]
13+
#[cfg_attr(bootstrap, rustc_const_stable(feature = "const_locks", since = "1.63.0"))]
1414
pub const fn new() -> RwLock {
1515
RwLock { mode: Cell::new(0) }
1616
}

stdarch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit c881fe3231b3947a4766aa15a26a93022fbb8723
1+
Subproject commit ff9a4445038eae46fd095188740946808581bc0e

0 commit comments

Comments
 (0)