about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-11-16 22:43:32 +0000
committerbors <bors@rust-lang.org>2015-11-16 22:43:32 +0000
commit9f49ea0f4bfceee4d77663c09978b720358e763d (patch)
treee0da86348078f11760efdcb26066b53f20e53574 /src/libstd/sync
parent73cfcc60e1d776c748269bf1fe411a087cb26076 (diff)
parent0050895637bae07070c3441d17accb6d9444a711 (diff)
downloadrust-9f49ea0f4bfceee4d77663c09978b720358e763d.tar.gz
rust-9f49ea0f4bfceee4d77663c09978b720358e763d.zip
Auto merge of #29872 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #29549, #29796, #29843, #29863, #29865
- Failed merges:
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mutex.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs
index c0cd6d127d2..48631bfc5f9 100644
--- a/src/libstd/sync/mutex.rs
+++ b/src/libstd/sync/mutex.rs
@@ -66,7 +66,7 @@ use sys_common::poison::{self, TryLockError, TryLockResult, LockResult};
 /// for _ in 0..10 {
 ///     let (data, tx) = (data.clone(), tx.clone());
 ///     thread::spawn(move || {
-///         // The shared static can only be accessed once the lock is held.
+///         // The shared state can only be accessed once the lock is held.
 ///         // Our non-atomic increment is safe because we're the only thread
 ///         // which can access the shared state when the lock is held.
 ///         //