diff options
| author | bors <bors@rust-lang.org> | 2024-10-28 16:25:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-28 16:25:56 +0000 |
| commit | 3f1be1ec7ec3d8e80beb381ee82164a0aa3ca777 (patch) | |
| tree | 5f80bff44416146cfd7dadade45acde6bcf9926e /library | |
| parent | 9f57edf2e261ade3c926d69459162057f15164d6 (diff) | |
| parent | d066dfdb835f15fe2c4d2bdb31d88cb948b360ad (diff) | |
| download | rust-3f1be1ec7ec3d8e80beb381ee82164a0aa3ca777.tar.gz rust-3f1be1ec7ec3d8e80beb381ee82164a0aa3ca777.zip | |
Auto merge of #132145 - RalfJung:stdarch, r=Amanieu
bump stdarch This lets us remove a hack from https://github.com/rust-lang/rust/pull/131349. r? `@Amanieu` try-job: test-various
Diffstat (limited to 'library')
| -rw-r--r-- | library/std/src/sys/sync/condvar/no_threads.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/sync/mutex/no_threads.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/sync/once/no_threads.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/sync/rwlock/no_threads.rs | 2 | ||||
| m--------- | library/stdarch | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/library/std/src/sys/sync/condvar/no_threads.rs b/library/std/src/sys/sync/condvar/no_threads.rs index 36b89c5f5be..2a67ed766aa 100644 --- a/library/std/src/sys/sync/condvar/no_threads.rs +++ b/library/std/src/sys/sync/condvar/no_threads.rs @@ -5,7 +5,7 @@ pub struct Condvar {} impl Condvar { #[inline] - #[rustc_const_stable(feature = "const_locks", since = "1.63.0")] + #[cfg_attr(bootstrap, rustc_const_stable(feature = "const_locks", since = "1.63.0"))] pub const fn new() -> Condvar { Condvar {} } diff --git a/library/std/src/sys/sync/mutex/no_threads.rs b/library/std/src/sys/sync/mutex/no_threads.rs index 4a13c55fb8b..7b243575e01 100644 --- a/library/std/src/sys/sync/mutex/no_threads.rs +++ b/library/std/src/sys/sync/mutex/no_threads.rs @@ -10,7 +10,7 @@ unsafe impl Sync for Mutex {} // no threads on this platform impl Mutex { #[inline] - #[rustc_const_stable(feature = "const_locks", since = "1.63.0")] + #[cfg_attr(bootstrap, rustc_const_stable(feature = "const_locks", since = "1.63.0"))] pub const fn new() -> Mutex { Mutex { locked: Cell::new(false) } } diff --git a/library/std/src/sys/sync/once/no_threads.rs b/library/std/src/sys/sync/once/no_threads.rs index cdcffe790f5..fb1b496510a 100644 --- a/library/std/src/sys/sync/once/no_threads.rs +++ b/library/std/src/sys/sync/once/no_threads.rs @@ -35,7 +35,7 @@ unsafe impl Sync for Once {} impl Once { #[inline] - #[rustc_const_stable(feature = "const_once_new", since = "1.32.0")] + #[cfg_attr(bootstrap, rustc_const_stable(feature = "const_once_new", since = "1.32.0"))] pub const fn new() -> Once { Once { state: Cell::new(State::Incomplete) } } diff --git a/library/std/src/sys/sync/rwlock/no_threads.rs b/library/std/src/sys/sync/rwlock/no_threads.rs index 789ef9b29e5..6965e2e2cab 100644 --- a/library/std/src/sys/sync/rwlock/no_threads.rs +++ b/library/std/src/sys/sync/rwlock/no_threads.rs @@ -10,7 +10,7 @@ unsafe impl Sync for RwLock {} // no threads on this platform impl RwLock { #[inline] - #[rustc_const_stable(feature = "const_locks", since = "1.63.0")] + #[cfg_attr(bootstrap, rustc_const_stable(feature = "const_locks", since = "1.63.0"))] pub const fn new() -> RwLock { RwLock { mode: Cell::new(0) } } diff --git a/library/stdarch b/library/stdarch -Subproject c881fe3231b3947a4766aa15a26a93022fbb872 +Subproject ff9a4445038eae46fd095188740946808581bc0 |