about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2015-05-13 15:09:17 +1200
committerNick Cameron <ncameron@mozilla.com>2015-05-13 15:09:17 +1200
commit103e52b1db92b9ac57dcebf5c5738ad5a45155ad (patch)
treef25dde7fb14152c900f89c7b9c85e63b1439c828 /src/libstd/thread
parent5d16772ecb93270ac64b44b429a157f397a3e41d (diff)
parentc2b30b86df6b34ba19e87e63402e43d9e81a64fb (diff)
downloadrust-103e52b1db92b9ac57dcebf5c5738ad5a45155ad.tar.gz
rust-103e52b1db92b9ac57dcebf5c5738ad5a45155ad.zip
Merge branch 'master' into mulit-decor
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/local.rs2
-rw-r--r--src/libstd/thread/scoped_tls.rs2
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 {