diff options
| author | bors <bors@rust-lang.org> | 2017-02-18 17:10:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-18 17:10:34 +0000 |
| commit | 306035c21741928bef75b8915d2195cce400b70a (patch) | |
| tree | 4aa49cfb106dc1deb4b2b52a11ea577efa7b21db /src/libstd/thread | |
| parent | 8f2fc9db15d41285619138900c6f65686bd32a2a (diff) | |
| parent | 98c2cf2ae5ee9ec69d06b32964156a13c94f4402 (diff) | |
| download | rust-306035c21741928bef75b8915d2195cce400b70a.tar.gz rust-306035c21741928bef75b8915d2195cce400b70a.zip | |
Auto merge of #39933 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests - Successful merges: #39847, #39862, #39898, #39904, #39928 - Failed merges:
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 4 |
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 /// |