about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-11-26 13:32:43 -0800
committerbors <bors@rust-lang.org>2013-11-26 13:32:43 -0800
commit35ebf0348905a3a78025af4019e23ab97c86ec34 (patch)
tree3a1a084d2e09d55ed9023320fd8d8b242a35a4d5 /doc
parente9a1869a5f4164d5311963b1b25b05f003d43699 (diff)
parenta5af479bb479a2a4d3289f9feed9ac3ff299a395 (diff)
auto merge of #10312 : thestinger/rust/thread_local, r=alexcritchton
This provides a building block for fast thread-local storage. It does
not change the safety semantics of `static mut`.

Closes #10310
Diffstat (limited to 'doc')
-rw-r--r--doc/rust.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/rust.md b/doc/rust.md
index 4fca2b33696..852feef4651 100644
--- a/doc/rust.md
+++ b/doc/rust.md
@@ -1754,6 +1754,8 @@ names are effectively reserved. Some significant attributes include:
 * The `deriving` attribute, for automatically generating
   implementations of certain traits.
 * The `static_assert` attribute, for asserting that a static bool is true at compiletime
+* The `thread_local` attribute, for defining a `static mut` as a thread-local. Note that this is
+  only a low-level building block, and is not local to a *task*, nor does it provide safety.
 
 Other attributes may be added or removed during development of the language.