Skip to content

Commit 04535f2

Browse files
committed
Auto merge of rust-lang#148446 - GuillaumeGomez:rollup-lxwlqol, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - rust-lang#135099 (Add FileCheck annotations to mir-opt/copy-prop) - rust-lang#145903 (Give correct suggestion for a typo in raw pointers) - rust-lang#147520 (Port the remaining SIMD intrinsics to const-eval) - rust-lang#148068 (rustdoc: Use configured target modifiers when collecting doctests) - rust-lang#148099 (Prepare to move debugger discovery from compiletest to bootstrap) - rust-lang#148268 (rustdoc: fix `--emit=dep-info` on scraped examples) - rust-lang#148306 (Remove double check when decoding ExpnId to avoid races) - rust-lang#148378 (Fix documentation for std::panic::update_hook) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f160ad9 + 9943888 commit 04535f2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

std/src/panicking.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ pub fn take_hook() -> Box<dyn Fn(&PanicHookInfo<'_>) + 'static + Sync + Send> {
215215
///
216216
/// // Equivalent to
217217
/// // let prev = panic::take_hook();
218-
/// // panic::set_hook(move |info| {
218+
/// // panic::set_hook(Box::new(move |info| {
219219
/// // println!("...");
220220
/// // prev(info);
221-
/// // );
221+
/// // }));
222222
/// panic::update_hook(move |prev, info| {
223223
/// println!("Print custom message and execute panic handler as usual");
224224
/// prev(info);

0 commit comments

Comments
 (0)