diff options
| author | bors <bors@rust-lang.org> | 2017-04-05 16:47:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-05 16:47:45 +0000 |
| commit | 46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5 (patch) | |
| tree | f1781c8eee2c19a80fc40159ebe7c9de37817f31 /src/libstd/thread/mod.rs | |
| parent | ad5dfecc6ae23bb7d2b8075d705011918ab4f399 (diff) | |
| parent | 97a1f4b1f4e2acc25f939ea08ff634f70e1ab58d (diff) | |
| download | rust-46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5.tar.gz rust-46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5.zip | |
Auto merge of #41086 - frewsxcv:rollup, r=frewsxcv
Rollup of 19 pull requests - Successful merges: #40608, #40870, #40949, #40977, #40981, #40988, #40992, #40997, #40999, #41007, #41014, #41019, #41035, #41043, #41049, #41062, #41066, #41076, #41085 - Failed merges:
Diffstat (limited to 'src/libstd/thread/mod.rs')
| -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 edf928d6106..18c00e7c5f1 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -158,7 +158,7 @@ //! [`Err`]: ../../std/result/enum.Result.html#variant.Err //! [`panic!`]: ../../std/macro.panic.html //! [`Builder`]: ../../std/thread/struct.Builder.html -//! [`thread::current`]: ../../std/thread/fn.spawn.html +//! [`thread::current`]: ../../std/thread/fn.current.html //! [`Thread`]: ../../std/thread/struct.Thread.html //! [`park`]: ../../std/thread/fn.park.html //! [`unpark`]: ../../std/thread/struct.Thread.html#method.unpark |