about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-26 15:17:32 +0000
committerbors <bors@rust-lang.org>2017-08-26 15:17:32 +0000
commit32f60560798a9cec098f13de3af0c350e6dc7485 (patch)
tree1478abfdd87ca6b6296355b02edf36860ac2f2cd /src/libstd/thread
parent669d4770f2bac53a58bc9be0907f879b451be9b2 (diff)
parent502a11d53ed56aca9c35ae1c43117732cb221e16 (diff)
downloadrust-32f60560798a9cec098f13de3af0c350e6dc7485.tar.gz
rust-32f60560798a9cec098f13de3af0c350e6dc7485.zip
Auto merge of #44098 - frewsxcv:rollup, r=frewsxcv
Rollup of 7 pull requests

- Successful merges: #43776, #43966, #43979, #44072, #44086, #44090, #44091
- Failed merges:
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index ee103c803f5..6354e746af2 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -807,7 +807,7 @@ pub fn park_timeout_ms(ms: u32) {
 /// Platforms which do not support nanosecond precision for sleeping will have
 /// `dur` rounded up to the nearest granularity of time they can sleep for.
 ///
-/// # Example
+/// # Examples
 ///
 /// Waiting for the complete expiration of the timeout:
 ///