about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2017-02-18 18:10:12 +0100
committerGitHub <noreply@github.com>2017-02-18 18:10:12 +0100
commite4c285d1ac93b110acb559b7906d3b12cdc9d9b2 (patch)
tree8739dd3b664f15ce88de41e40699c0f7231cd6be /src/libstd
parente49f76f72e6ecf62c1efe69f721ce5ab8e2d00e5 (diff)
parent1fbbe79bcb97cc85dfe5f6c431b7aca9784a9bd4 (diff)
downloadrust-e4c285d1ac93b110acb559b7906d3b12cdc9d9b2.tar.gz
rust-e4c285d1ac93b110acb559b7906d3b12cdc9d9b2.zip
Rollup merge of #39862 - stjepang:fix-wording-localkey, r=GuillaumeGomez
Fix wording in LocalKey documentation

Fixes #39841

r? @GuillaumeGomez
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sync/once.rs2
-rw-r--r--src/libstd/thread/local.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs
index ba993751391..1e7394c0b09 100644
--- a/src/libstd/sync/once.rs
+++ b/src/libstd/sync/once.rs
@@ -316,7 +316,7 @@ impl Once {
                         }
 
                         // Once we've enqueued ourselves, wait in a loop.
-                        // Aftewards reload the state and continue with what we
+                        // Afterwards reload the state and continue with what we
                         // were doing from before.
                         while !node.signaled.load(Ordering::SeqCst) {
                             thread::park();
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
 ///