diff options
| author | bors <bors@rust-lang.org> | 2017-02-04 16:04:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-04 16:04:08 +0000 |
| commit | 8967085617f13fd11067e632f4f29e7eb013c1fd (patch) | |
| tree | e45c42c0320ae5ac94071f6457459a4f923fa36e /src/libstd/sync | |
| parent | e4eea733065ec39ba6031d856ace002c70035c44 (diff) | |
| parent | e204987bdb6739792a3ef6fc0001c4ab83004d8d (diff) | |
| download | rust-8967085617f13fd11067e632f4f29e7eb013c1fd.tar.gz rust-8967085617f13fd11067e632f4f29e7eb013c1fd.zip | |
Auto merge of #39533 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 3 pull requests - Successful merges: #39486, #39506, #39517 - Failed merges:
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/condvar.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 8ab30c51b28..5c85c4879a8 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -36,7 +36,7 @@ impl WaitTimeoutResult { /// consumes no CPU time while waiting for an event to occur. Condition /// variables are typically associated with a boolean predicate (a condition) /// and a mutex. The predicate is always verified inside of the mutex before -/// determining that thread must block. +/// determining that a thread must block. /// /// Functions in this module will block the current **thread** of execution and /// are bindings to system-provided condition variables where possible. Note |