From 2c23c06c32b0cc43545ddf5b361e2a0edd69d595 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sat, 30 Dec 2023 16:27:51 +0900 Subject: [PATCH] rc: Take *const T in is_dangling It is not important which one is used since `is_dangling` does not access memory, but `*const` removes the needs of `*const T` -> `*mut T` casts in `from_raw_in`. --- library/alloc/src/rc.rs | 4 ++-- library/alloc/src/sync.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/alloc/src/rc.rs b/library/alloc/src/rc.rs index 59f3a50ddb7..263b1449de1 100644 --- a/library/alloc/src/rc.rs +++ b/library/alloc/src/rc.rs @@ -2778,7 +2778,7 @@ impl Weak { } } -pub(crate) fn is_dangling(ptr: *mut T) -> bool { +pub(crate) fn is_dangling(ptr: *const T) -> bool { (ptr.cast::<()>()).addr() == usize::MAX } @@ -3003,7 +3003,7 @@ impl Weak { pub unsafe fn from_raw_in(ptr: *const T, alloc: A) -> Self { // See Weak::as_ptr for context on how the input pointer is derived. - let ptr = if is_dangling(ptr as *mut T) { + let ptr = if is_dangling(ptr) { // This is a dangling Weak. ptr as *mut RcBox } else { diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs index 85df491636a..edf2f66a30d 100644 --- a/library/alloc/src/sync.rs +++ b/library/alloc/src/sync.rs @@ -2722,7 +2722,7 @@ impl Weak { pub unsafe fn from_raw_in(ptr: *const T, alloc: A) -> Self { // See Weak::as_ptr for context on how the input pointer is derived. - let ptr = if is_dangling(ptr as *mut T) { + let ptr = if is_dangling(ptr) { // This is a dangling Weak. ptr as *mut ArcInner } else {