Skip to content

Commit

Permalink
Rollup merge of rust-lang#77719 - fusion-engineering-forks:const-new-…
Browse files Browse the repository at this point in the history
…mutex-attr-cleanup, r=Mark-Simulacrum

Remove unnecessary rustc_const_stable attributes.

These attributes were added in rust-lang#74033 (comment) 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](rust-lang#77154), so this can be cleaned up.

@rustbot modify labels: +T-libs +C-cleanup
  • Loading branch information
JohnTitor authored Oct 13, 2020
2 parents 1a33ac0 + e55d27f commit 1d8af29
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion library/std/src/sys/unsupported/mutex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
}
Expand Down
1 change: 0 additions & 1 deletion library/std/src/sys_common/mutex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down

0 comments on commit 1d8af29

Please sign in to comment.