diff options
| author | bors <bors@rust-lang.org> | 2018-04-30 17:30:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-30 17:30:55 +0000 |
| commit | 17841cc97ac950312355403b6cfe11b916e242a6 (patch) | |
| tree | 5bd04ce4f05ca35b78d7612b13bf3a15f4e49655 /src/libstd/panicking.rs | |
| parent | 4745092d608e65ec869c0ebdb27c535f27606ea4 (diff) | |
| parent | 6166f20571aeadc3e0790ab79b642b0a1d41169d (diff) | |
| download | rust-17841cc97ac950312355403b6cfe11b916e242a6.tar.gz rust-17841cc97ac950312355403b6cfe11b916e242a6.zip | |
Auto merge of #50345 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests Successful merges: - #50233 (Make `Vec::new` a `const fn`) - #50312 (Add more links in panic docs) - #50316 (Fix some broken links in docs.) - #50325 (Add a few more tests for proc macro feature gating) - #50327 (Display correct unused field suggestion for nested struct patterns) - #50330 (check that #[used] is used only on statics) - #50344 (Update Cargo to 2018-04-28 122fd5be5201913d42e219e132d6569493583bca) Failed merges:
Diffstat (limited to 'src/libstd/panicking.rs')
| -rw-r--r-- | src/libstd/panicking.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 24eae6a4c82..403056240bf 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -76,7 +76,9 @@ static mut HOOK: Hook = Hook::Default; /// is invoked. As such, the hook will run with both the aborting and unwinding /// runtimes. The default hook prints a message to standard error and generates /// a backtrace if requested, but this behavior can be customized with the -/// `set_hook` and `take_hook` functions. +/// `set_hook` and [`take_hook`] functions. +/// +/// [`take_hook`]: ./fn.take_hook.html /// /// The hook is provided with a `PanicInfo` struct which contains information /// about the origin of the panic, including the payload passed to `panic!` and @@ -121,6 +123,10 @@ pub fn set_hook(hook: Box<Fn(&PanicInfo) + 'static + Sync + Send>) { /// Unregisters the current panic hook, returning it. /// +/// *See also the function [`set_hook`].* +/// +/// [`set_hook`]: ./fn.set_hook.html +/// /// If no custom hook is registered, the default hook will be returned. /// /// # Panics |
