diff options
| author | bors <bors@rust-lang.org> | 2016-05-07 12:36:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-07 12:36:18 -0700 |
| commit | d91f8ab0f58fa123857d96b9e151fc5185f5ff08 (patch) | |
| tree | 4a21bdfb7f514938fb2996d83ac0b97b544464ab /src/libstd/sync | |
| parent | 936b32a514b73c1d3dfcbd9d17818f9f18bf4883 (diff) | |
| parent | 84e27738effd0c44f0dc480753fc0affa56fd4a4 (diff) | |
| download | rust-d91f8ab0f58fa123857d96b9e151fc5185f5ff08.tar.gz rust-d91f8ab0f58fa123857d96b9e151fc5185f5ff08.zip | |
Auto merge of #33487 - steveklabnik:rollup, r=steveklabnik
Rollup of 20 pull requests - Successful merges: #33256, #33283, #33313, #33314, #33326, #33336, #33382, #33384, #33402, #33409, #33410, #33412, #33428, #33430, #33437, #33438, #33439, #33442, #33456, #33459 - Failed merges:
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/barrier.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/rwlock.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/barrier.rs b/src/libstd/sync/barrier.rs index b543240c15a..b1267acdee6 100644 --- a/src/libstd/sync/barrier.rs +++ b/src/libstd/sync/barrier.rs @@ -71,7 +71,7 @@ impl Barrier { } } - /// Blocks the current thread until all threads has rendezvoused here. + /// Blocks the current thread until all threads have rendezvoused here. /// /// Barriers are re-usable after all threads have rendezvoused once, and can /// be used continuously. diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index 09b1b0a939d..cfb8ee16cb0 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -38,8 +38,8 @@ use sys_common::rwlock as sys; /// /// # Poisoning /// -/// RwLocks, like Mutexes, will become poisoned on panics. Note, however, that -/// an RwLock may only be poisoned if a panic occurs while it is locked +/// An `RwLock`, like `Mutex`, will become poisoned on a panic. Note, however, +/// that an `RwLock` may only be poisoned if a panic occurs while it is locked /// exclusively (write mode). If a panic occurs in any reader, then the lock /// will not be poisoned. /// |
