Auto merge of #92287 - JulianKnodt:slice_remainder, r=yaahc

[rust.git] / library / std / src / backtrace.rs

diff --git a/library/std/src/backtrace.rs b/library/std/src/backtrace.rs
index fded482095a4626b717f2ca3abe52bc6b293d1a3..05e9b2eb6bc3cb64b513a7d0a1b454ce4d475f5d 100644 (file)
--- a/library/std/src/backtrace.rs
+++ b/library/std/src/backtrace.rs
@@ -293,7 +293,7 @@ pub fn capture() -> Backtrace {
         if !Backtrace::enabled() {
             return Backtrace { inner: Inner::Disabled };
         }
-        Backtrace::create((Backtrace::capture as *mut ()).addr())
+        Backtrace::create(Backtrace::capture as usize)
     }
 
     /// Forcibly captures a full backtrace, regardless of environment variable
@@ -308,7 +308,7 @@ pub fn capture() -> Backtrace {
     /// parts of code.
     #[inline(never)] // want to make sure there's a frame here to remove
     pub fn force_capture() -> Backtrace {
-        Backtrace::create((Backtrace::force_capture as *mut ()).addr())
+        Backtrace::create(Backtrace::force_capture as usize)
     }
 
     /// Forcibly captures a disabled backtrace, regardless of environment
@@ -493,7 +493,7 @@ fn ip(&self) -> *mut c_void {
         match self {
             RawFrame::Actual(frame) => frame.ip(),
             #[cfg(test)]
-            RawFrame::Fake => ptr::invalid_mut(1),
+            RawFrame::Fake => crate::ptr::invalid_mut(1),
         }
     }
 }