[ACP 362] genericize ptr::from_raw_parts

Author: scottmcm

core/src/ptr/metadata.rs

@@ -120,7 +120,7 @@ pub const fn metadata<T: ?Sized>(ptr: *const T) -> <T as Pointee>::Metadata {
 #[rustc_const_unstable(feature = "ptr_metadata", issue = "81513")]
 #[inline]
 pub const fn from_raw_parts<T: ?Sized>(
- data_pointer: *const (),
+ data_pointer: *const impl Thin,
  metadata: <T as Pointee>::Metadata,
 ) -> *const T {
  aggregate_raw_ptr(data_pointer, metadata)
@@ -134,7 +134,7 @@ pub const fn from_raw_parts<T: ?Sized>(
 #[rustc_const_unstable(feature = "ptr_metadata", issue = "81513")]
 #[inline]
 pub const fn from_raw_parts_mut<T: ?Sized>(
- data_pointer: *mut (),
+ data_pointer: *mut impl Thin,
  metadata: <T as Pointee>::Metadata,
 ) -> *mut T {
  aggregate_raw_ptr(data_pointer, metadata)

core/src/ptr/mod.rs

@@ -565,7 +565,7 @@ pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
 #[rustc_allow_const_fn_unstable(ptr_metadata)]
 #[rustc_diagnostic_item = "ptr_null"]
 pub const fn null<T: ?Sized + Thin>() -> *const T {
- from_raw_parts(without_provenance(0), ())
+ from_raw_parts(without_provenance::<()>(0), ())
 }
 
 /// Creates a null mutable raw pointer.
@@ -591,7 +591,7 @@ pub const fn null<T: ?Sized + Thin>() -> *const T {
 #[rustc_allow_const_fn_unstable(ptr_metadata)]
 #[rustc_diagnostic_item = "ptr_null_mut"]
 pub const fn null_mut<T: ?Sized + Thin>() -> *mut T {
- from_raw_parts_mut(without_provenance_mut(0), ())
+ from_raw_parts_mut(without_provenance_mut::<()>(0), ())
 }
 
 /// Creates a pointer with the given address and no provenance.
@@ -835,7 +835,7 @@ pub const fn from_mut<T: ?Sized>(r: &mut T) -> *mut T {
 #[rustc_allow_const_fn_unstable(ptr_metadata)]
 #[rustc_diagnostic_item = "ptr_slice_from_raw_parts"]
 pub const fn slice_from_raw_parts<T>(data: *const T, len: usize) -> *const [T] {
- intrinsics::aggregate_raw_ptr(data, len)
+ from_raw_parts(data, len)
 }
 
 /// Forms a raw mutable slice from a pointer and a length.
@@ -881,7 +881,7 @@ pub const fn slice_from_raw_parts<T>(data: *const T, len: usize) -> *const [T] {
 #[rustc_const_unstable(feature = "const_slice_from_raw_parts_mut", issue = "67456")]
 #[rustc_diagnostic_item = "ptr_slice_from_raw_parts_mut"]
 pub const fn slice_from_raw_parts_mut<T>(data: *mut T, len: usize) -> *mut [T] {
- intrinsics::aggregate_raw_ptr(data, len)
+ from_raw_parts_mut(data, len)
 }
 
 /// Swaps the values at two mutable locations of the same type, without

core/src/str/converts.rs

@@ -222,7 +222,7 @@ pub const unsafe fn from_utf8_unchecked_mut(v: &mut [u8]) -> &mut str {
 #[rustc_const_unstable(feature = "str_from_raw_parts", issue = "119206")]
 pub const unsafe fn from_raw_parts<'a>(ptr: *const u8, len: usize) -> &'a str {
  // SAFETY: the caller must uphold the safety contract for `from_raw_parts`.
- unsafe { &*ptr::from_raw_parts(ptr.cast(), len) }
+ unsafe { &*ptr::from_raw_parts(ptr, len) }
 }
 
 /// Creates an `&mut str` from a pointer and a length.
@@ -241,5 +241,5 @@ pub const unsafe fn from_raw_parts<'a>(ptr: *const u8, len: usize) -> &'a str {
 #[rustc_const_unstable(feature = "const_str_from_raw_parts_mut", issue = "119206")]
 pub const unsafe fn from_raw_parts_mut<'a>(ptr: *mut u8, len: usize) -> &'a mut str {
  // SAFETY: the caller must uphold the safety contract for `from_raw_parts_mut`.
- unsafe { &mut *ptr::from_raw_parts_mut(ptr.cast(), len) }
+ unsafe { &mut *ptr::from_raw_parts_mut(ptr, len) }
 }

core/tests/mem.rs

@@ -83,12 +83,12 @@ fn align_of_val_raw_packed() {
  f: [u32],
  }
  let storage = [0u8; 4];
- let b: *const B = ptr::from_raw_parts(storage.as_ptr().cast(), 1);
+ let b: *const B = ptr::from_raw_parts(storage.as_ptr(), 1);
  assert_eq!(unsafe { align_of_val_raw(b) }, 1);
 
  const ALIGN_OF_VAL_RAW: usize = {
  let storage = [0u8; 4];
- let b: *const B = ptr::from_raw_parts(storage.as_ptr().cast(), 1);
+ let b: *const B = ptr::from_raw_parts(storage.as_ptr(), 1);
  unsafe { align_of_val_raw(b) }
  };
  assert_eq!(ALIGN_OF_VAL_RAW, 1);

core/tests/ptr.rs

@@ -965,15 +965,15 @@ fn thin_box() {
  fn value_ptr(&self) -> *const T {
  let (_, offset) = self.layout();
  let data_ptr = unsafe { self.ptr.cast::<u8>().as_ptr().add(offset) };
- ptr::from_raw_parts(data_ptr.cast(), self.meta())
+ ptr::from_raw_parts(data_ptr, self.meta())
  }
 
  fn value_mut_ptr(&mut self) -> *mut T {
  let (_, offset) = self.layout();
  // FIXME: can this line be shared with the same in `value_ptr()`
  // without upsetting Stacked Borrows?
  let data_ptr = unsafe { self.ptr.cast::<u8>().as_ptr().add(offset) };
- from_raw_parts_mut(data_ptr.cast(), self.meta())
+ from_raw_parts_mut(data_ptr, self.meta())
  }
  }