diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2017-08-28 02:41:16 +0200 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2017-08-28 02:41:16 +0200 |
| commit | d29af3799964caec55e3ee806f2ac0f8d494e481 (patch) | |
| tree | 0134ce33be6192b6e1f974fa6b7ad694067408b2 /src/libstd/thread/mod.rs | |
| parent | 7c5780b3564d98aec130ee2f27368b116a3f1160 (diff) | |
| parent | e2668882406b68739c6ed33d420358d5d710e67b (diff) | |
| download | rust-d29af3799964caec55e3ee806f2ac0f8d494e481.tar.gz rust-d29af3799964caec55e3ee806f2ac0f8d494e481.zip | |
Merge branch 'master' of https://github.com/rust-lang/rust into gen
Diffstat (limited to 'src/libstd/thread/mod.rs')
| -rw-r--r-- | src/libstd/thread/mod.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index ee103c803f5..4912ff93abd 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: /// @@ -1230,6 +1230,11 @@ impl<T> JoinHandle<T> { /// [`Err`]: ../../std/result/enum.Result.html#variant.Err /// [`panic`]: ../../std/macro.panic.html /// + /// # Panics + /// + /// This function may panic on some platforms if a thread attempts to join + /// itself or otherwise may create a deadlock with joining threads. + /// /// # Examples /// /// ``` |