diff options
| author | bors <bors@rust-lang.org> | 2015-05-11 14:30:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-11 14:30:08 +0000 |
| commit | f697041b37e8c9c86dfe463262501ad61dd2d4a3 (patch) | |
| tree | 58542ee8299b1e8c911712c499e825aabbf5020b /src/libstd/thread | |
| parent | 8004fc9fe0591f9537c0f6e993234eb86989c538 (diff) | |
| parent | 2b0191e6d55981a7a8d56ff14150f2474f89aef2 (diff) | |
| download | rust-f697041b37e8c9c86dfe463262501ad61dd2d4a3.tar.gz rust-f697041b37e8c9c86dfe463262501ad61dd2d4a3.zip | |
Auto merge of #25303 - Manishearth:rollup, r=Manishearth
- Successful merges: #25280, #25284, #25286, #25287, #25290, #25291, #25297 - Failed merges:
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 2 | ||||
| -rw-r--r-- | src/libstd/thread/scoped_tls.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 41bdf034705..2e043c58a5d 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -85,6 +85,8 @@ pub struct LocalKey<T> { } /// Declare a new thread local storage key of type `std::thread::LocalKey`. +/// +/// See [LocalKey documentation](thread/struct.LocalKey.html) for more information. #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] #[allow_internal_unstable] diff --git a/src/libstd/thread/scoped_tls.rs b/src/libstd/thread/scoped_tls.rs index 35684a1f390..e195c3aaa3f 100644 --- a/src/libstd/thread/scoped_tls.rs +++ b/src/libstd/thread/scoped_tls.rs @@ -66,6 +66,8 @@ pub struct ScopedKey<T> { #[doc(hidden)] pub inner: __impl::KeyInner<T> } /// /// This macro declares a `static` item on which methods are used to get and /// set the value stored within. +/// +/// See [ScopedKey documentation](thread/struct.ScopedKey.html) for more information. #[macro_export] #[allow_internal_unstable] macro_rules! scoped_thread_local { |