diff options
| author | bors <bors@rust-lang.org> | 2015-02-27 23:15:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-27 23:15:17 +0000 |
| commit | e233987ce1de88a48db2ce612019ba644d3cf5dd (patch) | |
| tree | f776ae018199c9ff2350a29dc569630f64455f87 /src/libstd/thread_local | |
| parent | bd0d8e47e53f25bbd50418a0f117973c366c1b08 (diff) | |
| parent | bde4c1d6fbefcd914a06b5eab6ef6f9a6f26f271 (diff) | |
| download | rust-e233987ce1de88a48db2ce612019ba644d3cf5dd.tar.gz rust-e233987ce1de88a48db2ce612019ba644d3cf5dd.zip | |
Auto merge of #22860 - Manishearth:rollup, r=alexcrichton
Passes check-stage1, check-stage2
Diffstat (limited to 'src/libstd/thread_local')
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index d65156dae96..764c7d730cb 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -105,10 +105,12 @@ pub struct Key<T> { // This is trivially devirtualizable by LLVM because we never store anything // to this field and rustc can declare the `static` as constant as well. #[doc(hidden)] + #[unstable(feature = "thread_local_internals")] pub inner: fn() -> &'static __impl::KeyInner<UnsafeCell<Option<T>>>, // initialization routine to invoke to create a value #[doc(hidden)] + #[unstable(feature = "thread_local_internals")] pub init: fn() -> T, } |