diff --git a/library/core/src/panic/panic_info.rs b/library/core/src/panic/panic_info.rs
index ee22521cb014c..d8d4073c83b9e 100644
--- a/library/core/src/panic/panic_info.rs
+++ b/library/core/src/panic/panic_info.rs
@@ -68,29 +68,24 @@ impl<'a> PanicInfo<'a> {
     /// This method will currently always return [`Some`], but this may change
     /// in future versions.
     ///
-    /// # Examples
-    ///
-    /// ```should_panic
-    /// use std::panic;
+    /// # Example
     ///
-    /// panic::set_hook(Box::new(|panic_info| {
+    /// ```ignore (no_std)
+    /// #[panic_handler]
+    /// fn panic_handler(panic_info: &PanicInfo<'_>) -> ! {
     ///     if let Some(location) = panic_info.location() {
-    ///         println!("panic occurred in file '{}' at line {}",
-    ///             location.file(),
-    ///             location.line(),
-    ///         );
+    ///         write!(DEBUG_OUTPUT, "panicked at {}", location);
     ///     } else {
-    ///         println!("panic occurred but can't get location information...");
+    ///         write!(DEBUG_OUTPUT, "panicked at unknown location");
     ///     }
-    /// }));
-    ///
-    /// panic!("Normal panic");
+    ///     loop {}
+    /// }
     /// ```
     #[must_use]
     #[stable(feature = "panic_hooks", since = "1.10.0")]
     pub fn location(&self) -> Option<&'static Location<'static>> {
         // NOTE: If this is changed to sometimes return None,
-        // deal with that case in std::panicking::default_hook and core::panicking::panic_fmt.
+        // deal with that case in std::panicking::panic_handler and core::panicking::panic_fmt.
         Some(self.location)
     }
 
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
index a07a5fb6290ca..23a4cabc320b0 100644
--- a/library/std/src/panic.rs
+++ b/library/std/src/panic.rs
@@ -162,7 +162,7 @@ impl<'a> PanicHookInfo<'a> {
     #[stable(feature = "panic_hooks", since = "1.10.0")]
     pub fn location(&self) -> Option<&'static Location<'static>> {
         // NOTE: If this is changed to sometimes return None,
-        // deal with that case in std::panicking::default_hook and core::panicking::panic_fmt.
+        // deal with that case in std::panicking::default_hook and std::panicking::panic_with_hook.
         Some(self.location)
     }