about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-07-24 14:56:03 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-07-24 14:56:03 -0400
commit8b6b6c678b94832480c4f62178925fb7062523cd (patch)
tree3adbb1cf25375cf3573605bfcbf4573290c66c58 /src/libstd
parenta160203e30d138944cd4b09f5a3fe6026b374dd0 (diff)
parenta700546feabd85fa06f2bbd446865c15431c0e09 (diff)
downloadrust-8b6b6c678b94832480c4f62178925fb7062523cd.tar.gz
rust-8b6b6c678b94832480c4f62178925fb7062523cd.zip
Rollup merge of #27235 - tbu-:pr_catch_panic_doc, r=steveklabnik
Fixes #27027.
Diffstat (limited to 'src/libstd')
-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