diff options
| author | bors <bors@rust-lang.org> | 2015-05-09 13:10:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-09 13:10:43 +0000 |
| commit | 497942332f919b1a952310a730349ca1b9524968 (patch) | |
| tree | 08d010750e4e09312bddfef9485be7717fd75424 /src/libstd/rt | |
| parent | 3906edf41e8faa0610daea954ffbda39841fbc0d (diff) | |
| parent | 511a8d47ebc9791e9b564807a370e59b0a83f13c (diff) | |
| download | rust-497942332f919b1a952310a730349ca1b9524968.tar.gz rust-497942332f919b1a952310a730349ca1b9524968.zip | |
Auto merge of #25243 - Manishearth:rollup, r=Manishearth
- Successful merges: #25216, #25227 - Failed merges:
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index a764b99e280..8e55ff0b76c 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -590,7 +590,7 @@ fn begin_unwind_inner(msg: Box<Any + Send>, /// This is an unsafe and experimental API which allows for an arbitrary /// callback to be invoked when a thread panics. This callback is invoked on both /// the initial unwinding and a double unwinding if one occurs. Additionally, -/// the local `Task` will be in place for the duration of the callback, and +/// the local `Thread` will be in place for the duration of the callback, and /// the callback must ensure that it remains in place once the callback returns. /// /// Only a limited number of callbacks can be registered, and this function |