diff options
| author | Stein Somers <git@steinsomers.be> | 2019-02-18 00:31:41 +0100 |
|---|---|---|
| committer | Stein Somers <git@steinsomers.be> | 2019-02-18 00:31:41 +0100 |
| commit | 01bebdf19321a1597f35c2fc2130f1627e944bcf (patch) | |
| tree | 2c71bc6a77545eacabdc67b1fcaa5f52dd22878c /src/libstd/sys/sgx/waitqueue.rs | |
| parent | 0b9ad6e6fd017837647eed8e5ae824d1f6e278b2 (diff) | |
| parent | 9a3392e174a432a5f06c1157befc1ce0fae74bec (diff) | |
| download | rust-01bebdf19321a1597f35c2fc2130f1627e944bcf.tar.gz rust-01bebdf19321a1597f35c2fc2130f1627e944bcf.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/libstd/sys/sgx/waitqueue.rs')
| -rw-r--r-- | src/libstd/sys/sgx/waitqueue.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/sgx/waitqueue.rs b/src/libstd/sys/sgx/waitqueue.rs index 51c00a1433e..aec643b3175 100644 --- a/src/libstd/sys/sgx/waitqueue.rs +++ b/src/libstd/sys/sgx/waitqueue.rs @@ -3,7 +3,7 @@ /// This queue is used to implement condition variable and mutexes. /// /// Users of this API are expected to use the `WaitVariable<T>` type. Since -/// that type is not `Sync`, it needs to be protected by e.g. a `SpinMutex` to +/// that type is not `Sync`, it needs to be protected by e.g., a `SpinMutex` to /// allow shared access. /// /// Since userspace may send spurious wake-ups, the wakeup event state is @@ -136,7 +136,7 @@ impl WaitQueue { self.inner.is_empty() } - /// Add the calling thread to the WaitVariable's wait queue, then wait + /// Adds the calling thread to the `WaitVariable`'s wait queue, then wait /// until a wakeup event. /// /// This function does not return until this thread has been awoken. |