aboutsummaryrefslogtreecommitdiff
path: root/src/thread.rs
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2022-12-08 15:39:29 +0100
committerJeff Vander Stoep <jeffv@google.com>2022-12-08 15:40:47 +0100
commit23cafcf3ba63d2f7b81342bc7d1dcac889cad6ca (patch)
tree1fd78d7ede8327fa1578b31fb56e3cc161bb511b /src/thread.rs
parent9ada2bd5aec1904ea3f24e64831cfc89a36b0188 (diff)
downloadcrossbeam-utils-23cafcf3ba63d2f7b81342bc7d1dcac889cad6ca.tar.gz
Upgrade crossbeam-utils to 0.8.14
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update rust/crates/crossbeam-utils For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: I8c623f3aa0ba969d6371c7656165ad0bce8ec5b2
Diffstat (limited to 'src/thread.rs')
-rw-r--r--src/thread.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/thread.rs b/src/thread.rs
index a59a4f5..f1086d9 100644
--- a/src/thread.rs
+++ b/src/thread.rs
@@ -130,7 +130,8 @@ type SharedOption<T> = Arc<Mutex<Option<T>>>;
/// All child threads that haven't been manually joined will be automatically joined just before
/// this function invocation ends. If all joined threads have successfully completed, `Ok` is
/// returned with the return value of `f`. If any of the joined threads has panicked, an `Err` is
-/// returned containing errors from panicked threads.
+/// returned containing errors from panicked threads. Note that if panics are implemented by
+/// aborting the process, no error is returned; see the notes of [std::panic::catch_unwind].
///
/// # Examples
///
@@ -490,7 +491,8 @@ pub struct ScopedJoinHandle<'scope, T> {
impl<T> ScopedJoinHandle<'_, T> {
/// Waits for the thread to finish and returns its result.
///
- /// If the child thread panics, an error is returned.
+ /// If the child thread panics, an error is returned. Note that if panics are implemented by
+ /// aborting the process, no error is returned; see the notes of [std::panic::catch_unwind].
///
/// # Panics
///