diff options
| author | Ralf Jung <post@ralfj.de> | 2024-02-11 19:04:29 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-02-21 20:15:52 +0100 |
| commit | b58f647d5488dce73bba517907c44af2c2a618c4 (patch) | |
| tree | 24e9b1e2a3299ccd459c5e00db09c64220d6ba21 /library/alloc/src | |
| parent | 1d447a9946effc38c4b964a888ab408a3df3c246 (diff) | |
| download | rust-b58f647d5488dce73bba517907c44af2c2a618c4.tar.gz rust-b58f647d5488dce73bba517907c44af2c2a618c4.zip | |
rename ptr::invalid -> ptr::without_provenance
also introduce ptr::dangling matching NonNull::dangling
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/rc.rs | 8 | ||||
| -rw-r--r-- | library/alloc/src/sync.rs | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/library/alloc/src/rc.rs b/library/alloc/src/rc.rs index 2cc38d90ffe..c3d0019be39 100644 --- a/library/alloc/src/rc.rs +++ b/library/alloc/src/rc.rs @@ -2804,7 +2804,9 @@ impl<T> Weak<T> { #[must_use] pub const fn new() -> Weak<T> { Weak { - ptr: unsafe { NonNull::new_unchecked(ptr::invalid_mut::<RcBox<T>>(usize::MAX)) }, + ptr: unsafe { + NonNull::new_unchecked(ptr::without_provenance_mut::<RcBox<T>>(usize::MAX)) + }, alloc: Global, } } @@ -2829,7 +2831,9 @@ impl<T, A: Allocator> Weak<T, A> { #[unstable(feature = "allocator_api", issue = "32838")] pub fn new_in(alloc: A) -> Weak<T, A> { Weak { - ptr: unsafe { NonNull::new_unchecked(ptr::invalid_mut::<RcBox<T>>(usize::MAX)) }, + ptr: unsafe { + NonNull::new_unchecked(ptr::without_provenance_mut::<RcBox<T>>(usize::MAX)) + }, alloc, } } diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs index e1211da4c61..524aa35e045 100644 --- a/library/alloc/src/sync.rs +++ b/library/alloc/src/sync.rs @@ -2555,7 +2555,9 @@ impl<T> Weak<T> { #[must_use] pub const fn new() -> Weak<T> { Weak { - ptr: unsafe { NonNull::new_unchecked(ptr::invalid_mut::<ArcInner<T>>(usize::MAX)) }, + ptr: unsafe { + NonNull::new_unchecked(ptr::without_provenance_mut::<ArcInner<T>>(usize::MAX)) + }, alloc: Global, } } @@ -2583,7 +2585,9 @@ impl<T, A: Allocator> Weak<T, A> { #[unstable(feature = "allocator_api", issue = "32838")] pub fn new_in(alloc: A) -> Weak<T, A> { Weak { - ptr: unsafe { NonNull::new_unchecked(ptr::invalid_mut::<ArcInner<T>>(usize::MAX)) }, + ptr: unsafe { + NonNull::new_unchecked(ptr::without_provenance_mut::<ArcInner<T>>(usize::MAX)) + }, alloc, } } |