about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorGlyne J. Gittens <Jgit121@gmail.com>2017-02-19 17:32:21 -0500
committerGlyne J. Gittens <Jgit121@gmail.com>2017-02-19 17:32:21 -0500
commit9a6a72b81837bed367de38297479ad554537d70c (patch)
treea9fc17869c699ea448d458d2194dec241e410099 /src/libstd/thread
parentb3f61ce538862e58d4d3cb02960fe6e9a8ccc4e4 (diff)
parent0e77277950aafd38ce3e52b7b1cd9bcc6664de3c (diff)
downloadrust-9a6a72b81837bed367de38297479ad554537d70c.tar.gz
rust-9a6a72b81837bed367de38297479ad554537d70c.zip
Merge branch 'master' of https://github.com/rust-lang/rust
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/local.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
index 5166ddf8a21..66f09a7069c 100644
--- a/src/libstd/thread/local.rs
+++ b/src/libstd/thread/local.rs
@@ -28,8 +28,8 @@ use mem;
 /// # Initialization and Destruction
 ///
 /// Initialization is dynamically performed on the first call to `with()`
-/// within a thread, and values support destructors which will be run when a
-/// thread exits.
+/// within a thread, and values that implement `Drop` get destructed when a
+/// thread exits. Some caveats apply, which are explained below.
 ///
 /// # Examples
 ///