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/thread | |
| parent | 2002ebacfbca288830a3c308ddc8189705c608fe (diff) | |
| parent | dbe7ed33cd14166ed52ff02f4db145e199c348cd (diff) | |
| download | rust-23744c84d9c0f8e4e870edb983f1ad6d33449c34.tar.gz rust-23744c84d9c0f8e4e870edb983f1ad6d33449c34.zip | |
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/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 094c468a677..ecd6fbc6b93 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -363,7 +363,7 @@ pub mod fast { use crate::cell::Cell; use crate::fmt; use crate::mem; - use crate::sys::fast_thread_local::register_dtor; + use crate::sys::thread_local_dtor::register_dtor; #[derive(Copy, Clone)] enum DtorState { @@ -468,7 +468,7 @@ pub mod os { use crate::fmt; use crate::marker; use crate::ptr; - use crate::sys_common::thread_local::StaticKey as OsStaticKey; + use crate::sys_common::thread_local_key::StaticKey as OsStaticKey; pub struct Key<T> { // OS-TLS key that we'll use to key off. |
