diff options
| author | León Orell Valerian Liehr <me@fmease.dev> | 2024-01-03 16:08:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 16:08:25 +0100 |
| commit | 34ef194859a1344637ba67a8e19c0539a2cc8458 (patch) | |
| tree | 59394d5b3f16445faca559ceb7a79ad957e3c2e2 | |
| parent | 4e265d9fe05c02bcc466782eccf1b83c092e0206 (diff) | |
| parent | 2c23c06c32b0cc43545ddf5b361e2a0edd69d595 (diff) | |
| download | rust-34ef194859a1344637ba67a8e19c0539a2cc8458.tar.gz rust-34ef194859a1344637ba67a8e19c0539a2cc8458.zip | |
Rollup merge of #119434 - taiki-e:rc-is-dangling, r=Mark-Simulacrum
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`.
| -rw-r--r-- | library/alloc/src/rc.rs | 4 | ||||
| -rw-r--r-- | 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<T, A: Allocator> Weak<T, A> { } } -pub(crate) fn is_dangling<T: ?Sized>(ptr: *mut T) -> bool { +pub(crate) fn is_dangling<T: ?Sized>(ptr: *const T) -> bool { (ptr.cast::<()>()).addr() == usize::MAX } @@ -3003,7 +3003,7 @@ impl<T: ?Sized, A: Allocator> Weak<T, A> { 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<T> } else { diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs index 1fc6fe631ab..5273b3cb2da 100644 --- a/library/alloc/src/sync.rs +++ b/library/alloc/src/sync.rs @@ -2722,7 +2722,7 @@ impl<T: ?Sized, A: Allocator> Weak<T, A> { 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<T> } else { |
