Skip to content

Commit

Permalink
Rollup merge of rust-lang#27235 - tbu-:pr_catch_panic_doc, r=stevekla…
Browse files Browse the repository at this point in the history
…bnik

Fixes rust-lang#27027.
  • Loading branch information
steveklabnik committed Jul 24, 2015
2 parents a160203 + a700546 commit 8b6b6c6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libstd/thread/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8b6b6c6

Please sign in to comment.