diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-12-22 21:59:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-22 21:59:27 +0100 |
| commit | c16f00cff667533ea279ab03d2067d63cb1e9eab (patch) | |
| tree | a48ec043bf5ad75fe8fa043c473de5231b01c4fe /library/core/src | |
| parent | e86874f8070be691d1efae2a3b83da58bb203071 (diff) | |
| parent | 5c04151c6cea29398b786b3fa781ec2f8f5ed1da (diff) | |
| download | rust-c16f00cff667533ea279ab03d2067d63cb1e9eab.tar.gz rust-c16f00cff667533ea279ab03d2067d63cb1e9eab.zip | |
Rollup merge of #134642 - kpreid:pointerlike-cell, r=compiler-errors
Implement `PointerLike` for `isize`, `NonNull`, `Cell`, `UnsafeCell`, and `SyncUnsafeCell`. * Implementing `PointerLike` for `UnsafeCell` enables the possibility of interior mutable `dyn*` values. Since this means potentially exercising new codegen behavior, I added a test for it in `tests/ui/dyn-star/cell.rs`. Please let me know if there are further sorts of tests that should be written, or other care that should be taken with this change. It is unfortunately not possible without compiler changes to implement `PointerLike` for `Atomic*` types, since they are not `repr(transparent)` (and, in theory if not in practice, `AtomicUsize`'s alignment may be greater than that of an ordinary pointer or `usize`). * Implementing `PointerLike` for `NonNull` is useful for pointer types which wrap `NonNull`. * Implementing `PointerLike` for `isize` is just for completeness; I have no use cases in mind, but I cannot think of any reason not to do this. * Tracking issue: #102425 `@rustbot` label +F-dyn_star (there is no label or tracking issue for F-pointer_like_trait)
Diffstat (limited to 'library/core/src')
| -rw-r--r-- | library/core/src/cell.rs | 11 | ||||
| -rw-r--r-- | library/core/src/marker.rs | 1 | ||||
| -rw-r--r-- | library/core/src/ptr/non_null.rs | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/library/core/src/cell.rs b/library/core/src/cell.rs index cfa4c1fb564..306d565a77e 100644 --- a/library/core/src/cell.rs +++ b/library/core/src/cell.rs @@ -252,7 +252,7 @@ use crate::cmp::Ordering; use crate::fmt::{self, Debug, Display}; -use crate::marker::{PhantomData, Unsize}; +use crate::marker::{PhantomData, PointerLike, Unsize}; use crate::mem; use crate::ops::{CoerceUnsized, Deref, DerefMut, DerefPure, DispatchFromDyn}; use crate::pin::PinCoerceUnsized; @@ -677,6 +677,9 @@ impl<T: CoerceUnsized<U>, U> CoerceUnsized<Cell<U>> for Cell<T> {} #[unstable(feature = "dispatch_from_dyn", issue = "none")] impl<T: DispatchFromDyn<U>, U> DispatchFromDyn<Cell<U>> for Cell<T> {} +#[unstable(feature = "pointer_like_trait", issue = "none")] +impl<T: PointerLike> PointerLike for Cell<T> {} + impl<T> Cell<[T]> { /// Returns a `&[Cell<T>]` from a `&Cell<[T]>` /// @@ -2258,6 +2261,9 @@ impl<T: CoerceUnsized<U>, U> CoerceUnsized<UnsafeCell<U>> for UnsafeCell<T> {} #[unstable(feature = "dispatch_from_dyn", issue = "none")] impl<T: DispatchFromDyn<U>, U> DispatchFromDyn<UnsafeCell<U>> for UnsafeCell<T> {} +#[unstable(feature = "pointer_like_trait", issue = "none")] +impl<T: PointerLike> PointerLike for UnsafeCell<T> {} + /// [`UnsafeCell`], but [`Sync`]. /// /// This is just an `UnsafeCell`, except it implements `Sync` @@ -2364,6 +2370,9 @@ impl<T: CoerceUnsized<U>, U> CoerceUnsized<SyncUnsafeCell<U>> for SyncUnsafeCell //#[unstable(feature = "sync_unsafe_cell", issue = "95439")] impl<T: DispatchFromDyn<U>, U> DispatchFromDyn<SyncUnsafeCell<U>> for SyncUnsafeCell<T> {} +#[unstable(feature = "pointer_like_trait", issue = "none")] +impl<T: PointerLike> PointerLike for SyncUnsafeCell<T> {} + #[allow(unused)] fn assert_coerce_unsized( a: UnsafeCell<&i32>, diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs index d0d8609f43f..29fc01d37fe 100644 --- a/library/core/src/marker.rs +++ b/library/core/src/marker.rs @@ -1003,6 +1003,7 @@ pub trait PointerLike {} marker_impls! { #[unstable(feature = "pointer_like_trait", issue = "none")] PointerLike for + isize, usize, {T} &T, {T} &mut T, diff --git a/library/core/src/ptr/non_null.rs b/library/core/src/ptr/non_null.rs index 3eeb9129347..e0ba469272e 100644 --- a/library/core/src/ptr/non_null.rs +++ b/library/core/src/ptr/non_null.rs @@ -1555,6 +1555,10 @@ impl<T: ?Sized, U: ?Sized> DispatchFromDyn<NonNull<U>> for NonNull<T> where T: U #[stable(feature = "pin", since = "1.33.0")] unsafe impl<T: ?Sized> PinCoerceUnsized for NonNull<T> {} +#[unstable(feature = "pointer_like_trait", issue = "none")] +#[cfg(not(bootstrap))] +impl<T> core::marker::PointerLike for NonNull<T> {} + #[stable(feature = "nonnull", since = "1.25.0")] impl<T: ?Sized> fmt::Debug for NonNull<T> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { |
