diff options
| author | bors <bors@rust-lang.org> | 2014-12-17 21:33:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-17 21:33:15 +0000 |
| commit | 22a9f250b5e2de64c13c0f056aec13eb086ef79d (patch) | |
| tree | d996edc2a0a259556be226b4f60437f961fb09b2 /src/libstd/sys | |
| parent | 66c297d847ce06a8982d4d322221b17a3cd04f90 (diff) | |
| parent | 5c98952409c9123b5f26b3c620029cd1914a07b6 (diff) | |
| download | rust-22a9f250b5e2de64c13c0f056aec13eb086ef79d.tar.gz rust-22a9f250b5e2de64c13c0f056aec13eb086ef79d.zip | |
auto merge of #19958 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/thread_local.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/sys/common/thread_local.rs b/src/libstd/sys/common/thread_local.rs index 3eb0e3f46cb..cf56a71d67a 100644 --- a/src/libstd/sys/common/thread_local.rs +++ b/src/libstd/sys/common/thread_local.rs @@ -58,7 +58,6 @@ use prelude::*; -use kinds::marker; use rustrt::exclusive::Exclusive; use sync::atomic::{mod, AtomicUint}; use sync::{Once, ONCE_INIT}; @@ -100,7 +99,6 @@ pub struct StaticKey { /// Inner contents of `StaticKey`, created by the `INIT_INNER` constant. pub struct StaticKeyInner { key: AtomicUint, - nc: marker::NoCopy, } /// A type for a safely managed OS-based TLS slot. @@ -141,7 +139,6 @@ pub const INIT: StaticKey = StaticKey { /// This value allows specific configuration of the destructor for a TLS key. pub const INIT_INNER: StaticKeyInner = StaticKeyInner { key: atomic::INIT_ATOMIC_UINT, - nc: marker::NoCopy, }; static INIT_KEYS: Once = ONCE_INIT; |