diff options
| author | bors <bors@rust-lang.org> | 2017-05-05 03:56:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-05 03:56:34 +0000 |
| commit | a6ab049ed1db09f693df7d33046b3980f56751c1 (patch) | |
| tree | 50a28372fab8299ce5a03cb645aa17f54bc6b7dd /src/libstd | |
| parent | 50b98587180a44782b22cbde1f638b61193ef7a3 (diff) | |
| parent | 3cd7f37482ddf7c2b34f50cf157b55cc8ac4140e (diff) | |
| download | rust-a6ab049ed1db09f693df7d33046b3980f56751c1.tar.gz rust-a6ab049ed1db09f693df7d33046b3980f56751c1.zip | |
Auto merge of #41762 - frewsxcv:rollup, r=frewsxcv
Rollup of 4 pull requests - Successful merges: #41741, #41746, #41749, #41754 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/thread/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 4e49c485f10..8e7eaa77cd7 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -66,7 +66,7 @@ //! let res = child.join(); //! ``` //! -//! The [`join`] method returns a [`Result`] containing [`Ok`] of the final +//! The [`join`] method returns a [`thread::Result`] containing [`Ok`] of the final //! value produced by the child thread, or [`Err`] of the value given to //! a call to [`panic!`] if the child panicked. //! @@ -159,6 +159,7 @@ //! [`panic!`]: ../../std/macro.panic.html //! [`Builder`]: ../../std/thread/struct.Builder.html //! [`thread::current`]: ../../std/thread/fn.current.html +//! [`thread::Result`]: ../../std/thread/type.Result.html //! [`Thread`]: ../../std/thread/struct.Thread.html //! [`park`]: ../../std/thread/fn.park.html //! [`unpark`]: ../../std/thread/struct.Thread.html#method.unpark |