diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-10-14 06:02:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 06:02:19 +0900 |
| commit | 7de5fe76f25304cb5a34b81a3989c6117b0761f0 (patch) | |
| tree | bac1d14693eb4634d715872119604569fab577e7 /library/std | |
| parent | 6a596210a669b269a694f55a24b908779da07487 (diff) | |
| parent | e55d27fbcefffbddb85f28cf4eb913674f2188c6 (diff) | |
Rollup merge of #77719 - fusion-engineering-forks:const-new-mutex-attr-cleanup, r=Mark-Simulacrum
Remove unnecessary rustc_const_stable attributes. These attributes were added in https://github.com/rust-lang/rust/pull/74033#discussion_r450593156 because of [std::io::lazy::Lazy::new](https://github.com/rust-lang/rust/blob/0c03aee8b81185d65b5821518661c30ecdb42de5/src/libstd/io/lazy.rs#L21-L23). But [std::io::lazy::Lazy is gone now](https://github.com/rust-lang/rust/pull/77154), so this can be cleaned up. @rustbot modify labels: +T-libs +C-cleanup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/sys/unsupported/mutex.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys_common/mutex.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/library/std/src/sys/unsupported/mutex.rs b/library/std/src/sys/unsupported/mutex.rs index 06ea9a1e2c1..ed4605f0595 100644 --- a/library/std/src/sys/unsupported/mutex.rs +++ b/library/std/src/sys/unsupported/mutex.rs @@ -10,7 +10,6 @@ unsafe impl Send for Mutex {} unsafe impl Sync for Mutex {} // no threads on this platform impl Mutex { - #[rustc_const_stable(feature = "const_sys_mutex_new", since = "1.0.0")] pub const fn new() -> Mutex { Mutex { locked: UnsafeCell::new(false) } } diff --git a/library/std/src/sys_common/mutex.rs b/library/std/src/sys_common/mutex.rs index a1e11d24465..91d919a3f9b 100644 --- a/library/std/src/sys_common/mutex.rs +++ b/library/std/src/sys_common/mutex.rs @@ -21,7 +21,6 @@ impl StaticMutex { /// first used with any of the functions below. /// Also, the behavior is undefined if this mutex is ever used reentrantly, /// i.e., `lock` is called by the thread currently holding the lock. - #[rustc_const_stable(feature = "const_sys_mutex_new", since = "1.0.0")] pub const fn new() -> Self { Self(imp::Mutex::new()) } |
