pointer::wrapping_byte_sub is now stable

rune-rs · May 4, 2024 · 85ed4e1 · 85ed4e1
1 parent 9fec66c
commit 85ed4e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/crates/rune-alloc/src/ptr.rs b/crates/rune-alloc/src/ptr.rs
@@ -59,21 +59,6 @@ pub const fn invalid_mut<T>(addr: usize) -> *mut T {
     unsafe { mem::transmute(addr) }
 }
 
-cfg_if! {
-    if #[cfg(rune_nightly)] {
-        #[inline(always)]
-        pub(crate) const fn wrapping_byte_sub<T>(ptr: *const T, count: usize) -> *const T {
-            ptr.cast::<u8>().wrapping_sub(count).with_metadata_of(ptr)
-        }
-    } else {
-        #[inline(always)]
-        pub(crate) const fn wrapping_byte_sub<T>(ptr: *const T, count: usize) -> *const T {
-            // TODO: We need to use metadata.
-            ptr.cast::<u8>().wrapping_sub(count) as *const T
-        }
-    }
-}
-
 cfg_if! {
     if #[cfg(rune_nightly)] {
         #[inline(always)]

diff --git a/crates/rune-alloc/src/vec/into_iter.rs b/crates/rune-alloc/src/vec/into_iter.rs
@@ -110,7 +110,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> {
         } else if T::IS_ZST {
             // `ptr` has to stay where it is to remain aligned, so we reduce the length by 1 by
             // reducing the `end`.
-            self.end = ptr::wrapping_byte_sub(self.end, 1);
+            self.end = self.end.wrapping_byte_sub(1);
 
             // Make up a value of this ZST.
             Some(unsafe { mem::zeroed() })
@@ -145,7 +145,7 @@ impl<T, A: Allocator> DoubleEndedIterator for IntoIter<T, A> {
             None
         } else if T::IS_ZST {
             // See above for why 'ptr.offset' isn't used
-            self.end = ptr::wrapping_byte_sub(self.end, 1);
+            self.end = self.end.wrapping_byte_sub(1);
 
             // Make up a value of this ZST.
             Some(unsafe { mem::zeroed() })