updated returned Location references to 'static

Author: ijchen

library/core/src/panic/panic_info.rs

@@ -13,7 +13,7 @@ use crate::panic::Location;
 #[derive(Debug)]
 pub struct PanicInfo<'a> {
     message: &'a fmt::Arguments<'a>,
-    location: &'a Location<'static>,
+    location: &'static Location<'static>,
     can_unwind: bool,
     force_no_backtrace: bool,
 }
@@ -33,7 +33,7 @@ impl<'a> PanicInfo<'a> {
     #[inline]
     pub(crate) fn new(
         message: &'a fmt::Arguments<'a>,
-        location: &'a Location<'static>,
+        location: &'static Location<'static>,
         can_unwind: bool,
         force_no_backtrace: bool,
     ) -> Self {
@@ -88,10 +88,10 @@ impl<'a> PanicInfo<'a> {
     /// ```
     #[must_use]
     #[stable(feature = "panic_hooks", since = "1.10.0")]
-    pub fn location(&self) -> Option<&Location<'static>> {
+    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.
-        Some(&self.location)
+        Some(self.location)
     }
 
     /// Returns the payload associated with the panic.

library/std/src/panic.rs

@@ -41,15 +41,15 @@ pub type PanicInfo<'a> = PanicHookInfo<'a>;
 #[derive(Debug)]
 pub struct PanicHookInfo<'a> {
     payload: &'a (dyn Any + Send),
-    location: &'a Location<'static>,
+    location: &'static Location<'static>,
     can_unwind: bool,
     force_no_backtrace: bool,
 }
 
 impl<'a> PanicHookInfo<'a> {
     #[inline]
     pub(crate) fn new(
-        location: &'a Location<'static>,
+        location: &'static Location<'static>,
         payload: &'a (dyn Any + Send),
         can_unwind: bool,
         force_no_backtrace: bool,
@@ -160,10 +160,10 @@ impl<'a> PanicHookInfo<'a> {
     #[must_use]
     #[inline]
     #[stable(feature = "panic_hooks", since = "1.10.0")]
-    pub fn location(&self) -> Option<&Location<'static>> {
+    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.
-        Some(&self.location)
+        Some(self.location)
     }
 
     /// Returns whether the panic handler is allowed to unwind the stack from

library/std/src/panicking.rs

@@ -795,7 +795,7 @@ fn payload_as_str(payload: &dyn Any) -> &str {
 #[optimize(size)]
 fn panic_with_hook(
     payload: &mut dyn PanicPayload,
-    location: &Location<'static>,
+    location: &'static Location<'static>,
     can_unwind: bool,
     force_no_backtrace: bool,
 ) -> ! {

library/std/tests/panic.rs

@@ -1,8 +1,7 @@
 #![allow(dead_code)]
 
-use core::panic::PanicInfo;
 use std::cell::RefCell;
-use std::panic::{AssertUnwindSafe, Location, PanicHookInfo, UnwindSafe};
+use std::panic::{AssertUnwindSafe, UnwindSafe};
 use std::rc::Rc;
 use std::sync::{Arc, Mutex, RwLock};
 
@@ -55,20 +54,3 @@ fn panic_safety_traits() {
         assert::<Arc<AssertUnwindSafe<T>>>();
     }
 }
-
-#[test]
-fn panic_info_static_location<'x>() {
-    // Verify that the returned `Location<'_>`s generic lifetime is 'static when
-    // calling `PanicInfo::location`. Test failure is indicated by a compile
-    // failure, not a runtime panic.
-    let _: for<'a> fn(&'a PanicInfo<'x>) -> Option<&'a Location<'static>> = PanicInfo::location;
-}
-
-#[test]
-fn panic_hook_info_static_location<'x>() {
-    // Verify that the returned `Location<'_>`s generic lifetime is 'static when
-    // calling `PanicHookInfo::location`. Test failure is indicated by a compile
-    // failure, not a runtime panic.
-    let _: for<'a> fn(&'a PanicHookInfo<'x>) -> Option<&'a Location<'static>> =
-        PanicHookInfo::location;
-}