diff options
| author | bors <bors@rust-lang.org> | 2020-07-14 20:19:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-14 20:19:59 +0000 |
| commit | 23744c84d9c0f8e4e870edb983f1ad6d33449c34 (patch) | |
| tree | 873851698947a162abdd85a971618981b1e19b2a /src/libstd/sys/windows | |
| parent | 2002ebacfbca288830a3c308ddc8189705c608fe (diff) | |
| parent | dbe7ed33cd14166ed52ff02f4db145e199c348cd (diff) | |
Auto merge of #74342 - Manishearth:rollup-l63pesj, r=Manishearth
Rollup of 11 pull requests Successful merges: - #73759 (Add missing Stdin and StdinLock examples) - #74211 (Structured suggestion when not using struct pattern) - #74228 (Provide structured suggestion on unsized fields and fn params) - #74252 (Don't allow `DESTDIR` to influence LLVM builds) - #74263 (Slight reorganization of sys/(fast_)thread_local) - #74271 (process_unix: prefer i32::*_be_bytes over manually shifting bytes) - #74272 (pprust: support multiline comments within lines) - #74332 (Update cargo) - #74334 (bootstrap: Improve wording on docs for `verbose-tests`) - #74336 (typeck: use `item_name` in cross-crate packed diag) - #74340 (lint: use `transparent_newtype_field` to avoid ICE) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/thread_local_dtor.rs (renamed from src/libstd/sys/windows/fast_thread_local.rs) | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/thread_local_key.rs (renamed from src/libstd/sys/windows/thread_local.rs) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index 193ab5b47ef..9a52371280e 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.rs @@ -20,7 +20,6 @@ pub mod cmath; pub mod condvar; pub mod env; pub mod ext; -pub mod fast_thread_local; pub mod fs; pub mod handle; pub mod io; @@ -35,7 +34,8 @@ pub mod process; pub mod rand; pub mod rwlock; pub mod thread; -pub mod thread_local; +pub mod thread_local_dtor; +pub mod thread_local_key; pub mod time; cfg_if::cfg_if! { if #[cfg(not(target_vendor = "uwp"))] { diff --git a/src/libstd/sys/windows/fast_thread_local.rs b/src/libstd/sys/windows/thread_local_dtor.rs index 191fa07f32a..7be13bc4b2b 100644 --- a/src/libstd/sys/windows/fast_thread_local.rs +++ b/src/libstd/sys/windows/thread_local_dtor.rs @@ -1,4 +1,4 @@ #![unstable(feature = "thread_local_internals", issue = "none")] #![cfg(target_thread_local)] -pub use crate::sys_common::thread_local::register_dtor_fallback as register_dtor; +pub use crate::sys_common::thread_local_dtor::register_dtor_fallback as register_dtor; diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local_key.rs index e0bb102b3af..e0bb102b3af 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local_key.rs |