Make pointer::byte_offset_from more generic

WaffleLapkin · WaffleLapkin · commit 6279d092c32b · 2022-10-24T16:05:54.000Z
diff --git a/library/core/src/ptr/const_ptr.rs b/library/core/src/ptr/const_ptr.rs
@@ -684,7 +684,7 @@ impl<T: ?Sized> *const T {
     #[unstable(feature = "pointer_byte_offsets", issue = "96283")]
     #[rustc_const_unstable(feature = "const_pointer_byte_offsets", issue = "96283")]
     #[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
-    pub const unsafe fn byte_offset_from(self, origin: *const T) -> isize {
+    pub const unsafe fn byte_offset_from<U: ?Sized>(self, origin: *const U) -> isize {
         // SAFETY: the caller must uphold the safety contract for `offset_from`.
         unsafe { self.cast::<u8>().offset_from(origin.cast::<u8>()) }
     }
diff --git a/library/core/src/ptr/mut_ptr.rs b/library/core/src/ptr/mut_ptr.rs
@@ -861,7 +861,7 @@ impl<T: ?Sized> *mut T {
     #[unstable(feature = "pointer_byte_offsets", issue = "96283")]
     #[rustc_const_unstable(feature = "const_pointer_byte_offsets", issue = "96283")]
     #[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
-    pub const unsafe fn byte_offset_from(self, origin: *const T) -> isize {
+    pub const unsafe fn byte_offset_from<U: ?Sized>(self, origin: *const U) -> isize {
         // SAFETY: the caller must uphold the safety contract for `offset_from`.
         unsafe { self.cast::<u8>().offset_from(origin.cast::<u8>()) }
     }

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ impl<T: ?Sized> *const T {`
`684`	`684`	`#[unstable(feature = "pointer_byte_offsets", issue = "96283")]`
`685`	`685`	`#[rustc_const_unstable(feature = "const_pointer_byte_offsets", issue = "96283")]`
`686`	`686`	`#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces`
`687`		`- pub const unsafe fn byte_offset_from(self, origin: *const T) -> isize {`
	`687`	`+ pub const unsafe fn byte_offset_from<U: ?Sized>(self, origin: *const U) -> isize {`
`688`	`688`	// SAFETY: the caller must uphold the safety contract for `offset_from`.
`689`	`689`	`unsafe { self.cast::<u8>().offset_from(origin.cast::<u8>()) }`
`690`	`690`	`}`
Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ impl<T: ?Sized> *mut T {`
`861`	`861`	`#[unstable(feature = "pointer_byte_offsets", issue = "96283")]`
`862`	`862`	`#[rustc_const_unstable(feature = "const_pointer_byte_offsets", issue = "96283")]`
`863`	`863`	`#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces`
`864`		`- pub const unsafe fn byte_offset_from(self, origin: *const T) -> isize {`
	`864`	`+ pub const unsafe fn byte_offset_from<U: ?Sized>(self, origin: *const U) -> isize {`
`865`	`865`	// SAFETY: the caller must uphold the safety contract for `offset_from`.
`866`	`866`	`unsafe { self.cast::<u8>().offset_from(origin.cast::<u8>()) }`
`867`	`867`	`}`