diff options
| author | bors <bors@rust-lang.org> | 2016-09-30 11:08:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 11:08:58 -0700 |
| commit | 50932b5f4e3a5f1b6c955100da5b30d77bcd29d3 (patch) | |
| tree | dbce305f5d8ea4c390a3aa27831a7756e6b22981 /src/libstd/thread | |
| parent | 954873055a998a06841ac19b39b1fe18a6641731 (diff) | |
| parent | af1df9880f603320bde62c8786f2208d659ce8ae (diff) | |
| download | rust-50932b5f4e3a5f1b6c955100da5b30d77bcd29d3.tar.gz rust-50932b5f4e3a5f1b6c955100da5b30d77bcd29d3.zip | |
Auto merge of #36864 - steveklabnik:rollup, r=steveklabnik
Rollup of 13 pull requests - Successful merges: #36529, #36535, #36576, #36623, #36711, #36750, #36810, #36829, #36833, #36841, #36842, #36851, #36860 - Failed merges:
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 d8e021bb04f..a634c8f77a4 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -151,7 +151,7 @@ //! //! [`Cell`]: ../cell/struct.Cell.html //! [`RefCell`]: ../cell/struct.RefCell.html -//! [`thread_local!`]: ../macro.thread_local!.html +//! [`thread_local!`]: ../macro.thread_local.html //! [`with`]: struct.LocalKey.html#method.with #![stable(feature = "rust1", since = "1.0.0")] |