about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-24 19:04:31 +0000
committerbors <bors@rust-lang.org>2015-07-24 19:04:31 +0000
commit82d40cb2ba44a27b7db8ec185b5c532237db4b3e (patch)
tree56707c7138fe42cabe96030d36c74a9b70e28a25 /src/libstd/thread
parent5e6b534362de257603f8fc318eba78deb83206e3 (diff)
parent427238ce2472ce23ee350bf0dcc9f5c42aa72ece (diff)
downloadrust-82d40cb2ba44a27b7db8ec185b5c532237db4b3e.tar.gz
rust-82d40cb2ba44a27b7db8ec185b5c532237db4b3e.zip
Auto merge of #27265 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #27137, #27145, #27177, #27193, #27212, #27220, #27229, #27235, #27238, #27244, #27251
- Failed merges: 
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index 3299c848ba7..20fcd309a6b 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -434,9 +434,9 @@ pub fn panicking() -> bool {
 
 /// Invokes a closure, capturing the cause of panic if one occurs.
 ///
-/// This function will return `Ok(())` if the closure does not panic, and will
-/// return `Err(cause)` if the closure panics. The `cause` returned is the
-/// object with which panic was originally invoked.
+/// This function will return `Ok` with the closure's result if the closure
+/// does not panic, and will return `Err(cause)` if the closure panics. The
+/// `cause` returned is the object with which panic was originally invoked.
 ///
 /// It is currently undefined behavior to unwind from Rust code into foreign
 /// code, so this function is particularly useful when Rust is called from