Rollup merge of #107595 - michaelwoerister:retry_proc_macro_loading, r=petrochenkov

[rust.git] / library / std / src / panic.rs

diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
index c4f022de021efa8e8ec2d80bb324bbb207b30180..9fa8f5702a8438b59c756f161d8a91df943f5337 100644 (file)
--- a/library/std/src/panic.rs
+++ b/library/std/src/panic.rs
@@ -114,6 +114,9 @@ impl<K, V, S> UnwindSafe for collections::HashMap<K, V, S>
 /// aborting the process as well. This function *only* catches unwinding panics,
 /// not those that abort the process.
 ///
+/// Note that if a custom panic hook has been set, it will be invoked before
+/// the panic is caught, before unwinding.
+///
 /// Also note that unwinding into Rust code with a foreign exception (e.g.
 /// an exception thrown from C++ code) is undefined behavior.
 ///