Skip to content

Commit 3f08ec0

Browse files
Pull back MSRV-breaking ptr::from_ref
1 parent ddf1b89 commit 3f08ec0

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/symbolize/dbghelp.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ use core::mem;
2626
use core::ptr;
2727
use core::slice;
2828

29+
// FIXME: replace with ptr::from_ref once MSRV is high enough
30+
#[inline(always)]
31+
#[must_use]
32+
const fn ptr_from_ref<T: ?Sized>(r: &T) -> *const T {
33+
r
34+
}
35+
2936
// Store an OsString on std so we can provide the symbol name and filename.
3037
pub struct Symbol<'a> {
3138
name: *const [u8],
@@ -257,7 +264,7 @@ unsafe fn do_resolve(
257264

258265
let len = len as usize;
259266

260-
filename = Some(ptr::from_ref(slice::from_raw_parts(base, len)));
267+
filename = Some(ptr_from_ref(slice::from_raw_parts(base, len)));
261268
}
262269

263270
cb(&super::Symbol {

0 commit comments

Comments
 (0)