Use payload_as_str instead of two downcasts.

1 files changed, 1 insertions, 4 deletions

diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
index 5282c00fcca..c5d1a893ee8 100644
--- a/library/std/src/panic.rs
+++ b/library/std/src/panic.rs
@@ -202,10 +202,7 @@ impl fmt::Display for PanicHookInfo<'_> {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter.write_str("panicked at ")?;
         self.location.fmt(formatter)?;
-        if let Some(payload) = self.payload.downcast_ref::<&'static str>() {
-            formatter.write_str(":\n")?;
-            formatter.write_str(payload)?;
-        } else if let Some(payload) = self.payload.downcast_ref::<String>() {
+        if let Some(payload) = self.payload_as_str() {
             formatter.write_str(":\n")?;
             formatter.write_str(payload)?;
         }