diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-05-30 14:33:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 14:33:49 +0200 |
| commit | 8fd9e24b9a7660fae2f10090e3063808d70afc97 (patch) | |
| tree | 1127ca88921ca9d6667250109529757c17c68ad2 | |
| parent | 0ed320bdb9dff0f26f682cd6c9ccd6bfbffe5df8 (diff) | |
| parent | 6d63d3b8889d36afbabcf6e70ad8710139c7b253 (diff) | |
Rollup merge of #97499 - est31:master, r=Dylan-DPC
Remove "sys isn't exported yet" phrase The oldest occurence is from 9e224c2bf18ebf8f871efb2e1aba43ed7970ebb7, which is from the pre-1.0 days. In the years since then, std::sys still hasn't been exported, and the last attempt was met with strong criticism: https://github.com/rust-lang/rust/pull/97151 Thus, removing the "yet" part makes a lot of sense.
| -rw-r--r-- | library/std/src/sys/unix/locks/pthread_mutex.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys_common/thread_local_dtor.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys_common/thread_local_key.rs | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/library/std/src/sys/unix/locks/pthread_mutex.rs b/library/std/src/sys/unix/locks/pthread_mutex.rs index 09cfa2f50ec..76840ce74dd 100644 --- a/library/std/src/sys/unix/locks/pthread_mutex.rs +++ b/library/std/src/sys/unix/locks/pthread_mutex.rs @@ -16,7 +16,6 @@ pub unsafe fn raw(m: &Mutex) -> *mut libc::pthread_mutex_t { unsafe impl Send for Mutex {} unsafe impl Sync for Mutex {} -#[allow(dead_code)] // sys isn't exported yet impl Mutex { pub const fn new() -> Mutex { // Might be moved to a different address, so it is better to avoid diff --git a/library/std/src/sys_common/thread_local_dtor.rs b/library/std/src/sys_common/thread_local_dtor.rs index f9971fb6f21..1d13a7171b0 100644 --- a/library/std/src/sys_common/thread_local_dtor.rs +++ b/library/std/src/sys_common/thread_local_dtor.rs @@ -11,7 +11,7 @@ //! or implement something more efficient. #![unstable(feature = "thread_local_internals", issue = "none")] -#![allow(dead_code)] // sys isn't exported yet +#![allow(dead_code)] use crate::ptr; use crate::sys_common::thread_local_key::StaticKey; diff --git a/library/std/src/sys_common/thread_local_key.rs b/library/std/src/sys_common/thread_local_key.rs index 32cd5641665..70beebe86d2 100644 --- a/library/std/src/sys_common/thread_local_key.rs +++ b/library/std/src/sys_common/thread_local_key.rs @@ -46,7 +46,7 @@ #![allow(non_camel_case_types)] #![unstable(feature = "thread_local_internals", issue = "none")] -#![allow(dead_code)] // sys isn't exported yet +#![allow(dead_code)] #[cfg(test)] mod tests; |