diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-06 05:38:37 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-06 16:21:09 +0530 |
| commit | 60cb151be061f859feaf6cf0246f0189b3ad35a9 (patch) | |
| tree | 104aae5be87431d442a0cc4ba6885405ff04d070 /src/libstd/rt | |
| parent | 67b51291f0ffb352ec3f4cc2455a85cfa3995946 (diff) | |
| parent | d992d3d9f3006f898dd0ad09458c85c66b23841c (diff) | |
| download | rust-60cb151be061f859feaf6cf0246f0189b3ad35a9.tar.gz rust-60cb151be061f859feaf6cf0246f0189b3ad35a9.zip | |
Rollup merge of #21924 - steveklabnik:fix_try_docs, r=huonw
This is now a Result, not an Option.
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index b37996fa9d9..e064663b9e7 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -98,8 +98,8 @@ thread_local! { static PANICKING: Cell<bool> = Cell::new(false) } /// Invoke a closure, capturing the cause of panic if one occurs. /// -/// This function will return `None` if the closure did not panic, and will -/// return `Some(cause)` if the closure panics. The `cause` returned is the +/// This function will return `Ok(())` if the closure did 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 also is unsafe for a variety of reasons: |