about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-07-11 10:02:03 +0200
committerGitHub <noreply@github.com>2018-07-11 10:02:03 +0200
commitc3d8236f8d3dd3f37962208cb2f415c95fde221c (patch)
treefc348a40d4a98c20b7458b3f2e27ab543231f141 /src
parentc202dfea9b42d10ff1980ae3664b3d1840d5f0a8 (diff)
parentd2fb2fb2a5f58839eda54e5f347e0959ed6eec7c (diff)
downloadrust-c3d8236f8d3dd3f37962208cb2f415c95fde221c.tar.gz
rust-c3d8236f8d3dd3f37962208cb2f415c95fde221c.zip
Rollup merge of #52238 - frewsxcv:frewsxcv-unwrap, r=GuillaumeGomez
Avoid unwrapping in PanicInfo doc example.

Fixes https://github.com/rust-lang/rust/issues/51768.
Diffstat (limited to 'src')
-rw-r--r--src/libcore/panic.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libcore/panic.rs b/src/libcore/panic.rs
index 1b4129b99fc..10f02ca2fdc 100644
--- a/src/libcore/panic.rs
+++ b/src/libcore/panic.rs
@@ -30,7 +30,11 @@ use fmt;
 /// use std::panic;
 ///
 /// panic::set_hook(Box::new(|panic_info| {
-///     println!("panic occurred: {:?}", panic_info.payload().downcast_ref::<&str>().unwrap());
+///     if let Some(s) = panic_info.payload().downcast_ref::<&str>() {
+///         println!("panic occurred: {:?}", s);
+///     } else {
+///         println!("panic occurred");
+///     }
 /// }));
 ///
 /// panic!("Normal panic");