diff options
| author | bors <bors@rust-lang.org> | 2015-04-30 00:07:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-30 00:07:10 +0000 |
| commit | 5449f5d29e175230a1285ebe92394f50c76e1df6 (patch) | |
| tree | c89deb8cc68b46e6fc768e862c32bd3e830a31c3 /src/libstd/thread | |
| parent | 551a74dddd84cf01440ee84148ebd18bc68bd7c8 (diff) | |
| parent | 1b34c099a6a624947877315875018093587a8834 (diff) | |
| download | rust-5449f5d29e175230a1285ebe92394f50c76e1df6.tar.gz rust-5449f5d29e175230a1285ebe92394f50c76e1df6.zip | |
Auto merge of #24967 - alexcrichton:rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index ae480380f95..bcc70c2b816 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -263,7 +263,7 @@ impl Builder { /// /// The child thread may outlive the parent (unless the parent thread /// is the main thread; the whole process is terminated when the main - /// thread finishes.) The join handle can be used to block on + /// thread finishes). The join handle can be used to block on /// termination of the child thread, including recovering its panics. /// /// # Errors |