diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2015-01-22 18:09:58 -0500 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2015-01-22 18:09:58 -0500 |
| commit | 3364d412827151c669c0dc2cc67e7c0e6e4d8c55 (patch) | |
| tree | a18cef48c8c271eb84581321ea38935210e815ea /src/libstd/thread.rs | |
| parent | 4db64bd82426fd914f98059e3fb7a146ed57ad9c (diff) | |
| parent | 618cf5f8d79dc92bcbdbe2c0e91d681e2e685cd7 (diff) | |
| download | rust-3364d412827151c669c0dc2cc67e7c0e6e4d8c55.tar.gz rust-3364d412827151c669c0dc2cc67e7c0e6e4d8c55.zip | |
Rollup merge of #21325 - nagisa:thread-panicking, r=steveklabnik
Previous wording wasn’t clear about its actual behaviour. It could be interpreted as answering either: * Can current thread panic? * Is current thread unwinding because of panic? r? @steveklabnik
Diffstat (limited to 'src/libstd/thread.rs')
| -rw-r--r-- | src/libstd/thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 1f181e1fa2a..a86b82b8c62 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -382,7 +382,7 @@ impl Thread { unsafe { imp::yield_now() } } - /// Determines whether the current thread is panicking. + /// Determines whether the current thread is unwinding because of panic. #[inline] #[stable] pub fn panicking() -> bool { |