about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-26 06:57:03 -0700
committerbors <bors@rust-lang.org>2016-04-26 06:57:03 -0700
commit092b0738b7f00740c997a3fb99dd0b8b50c4c157 (patch)
tree8c435f06c09506c7a0a9af9f837d3853a9afac7e /src/libstd/thread
parent03bef4c43b2f51df6bfd558b57b492cb821dd5ec (diff)
parent2b71219a618a8c9ad65cdcf008c2a1c6377eb1cd (diff)
downloadrust-092b0738b7f00740c997a3fb99dd0b8b50c4c157.tar.gz
rust-092b0738b7f00740c997a3fb99dd0b8b50c4c157.zip
Auto merge of #33203 - Ryman:patch-3, r=alexcrichton
libstd: fix typos in thread::LocalKey docs
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 69395001bbf..6b54ec8afca 100644
--- a/src/libstd/thread/local.rs
+++ b/src/libstd/thread/local.rs
@@ -60,7 +60,7 @@ use mem;
 /// # Platform-specific behavior
 ///
 /// Note that a "best effort" is made to ensure that destructors for types
-/// stored in thread local storage are run, but not all platforms can gurantee
+/// stored in thread local storage are run, but not all platforms can guarantee
 /// that destructors will be run for all types in thread local storage. For
 /// example, there are a number of known caveats where destructors are not run:
 ///
@@ -254,7 +254,7 @@ impl<T: 'static> LocalKey<T> {
     /// destruction has completed. Keys without destructors (e.g. with types
     /// that are `Copy`), may never enter the `Destroyed` state.
     ///
-    /// Keys in the `Uninitialized` can be accessed so long as the
+    /// Keys in the `Uninitialized` state can be accessed so long as the
     /// initialization does not panic. Keys in the `Valid` state are guaranteed
     /// to be able to be accessed. Keys in the `Destroyed` state will panic on
     /// any call to `with`.