Implement to_array via as_array

Author: calebzulawski

crates/core_simd/src/vector.rs

@@ -184,28 +184,16 @@ where
     /// # Safety
     /// Reading `ptr` must be safe, as if by `<*const [T; N]>::read_unaligned`.
     const unsafe fn load(ptr: *const [T; N]) -> Self {
-        let mut tmp = core::mem::MaybeUninit::uninit();
+        let mut tmp = core::mem::MaybeUninit::<Self>::uninit();
         // SAFETY: `Simd<T, N>` always contains `N` elements of type `T`.  It may have padding
         // which does not need to be initialized.  The safety of reading `ptr` is ensured by the
         // caller.
         unsafe {
-            core::ptr::copy_nonoverlapping(ptr, tmp.as_mut_ptr() as *mut _, 1);
+            core::ptr::copy_nonoverlapping(ptr, tmp.as_mut_ptr().cast(), 1);
             tmp.assume_init()
         }
     }
 
-    /// Store a vector to an array of `T`.
-    ///
-    /// See `load` as to why this function is necessary.
-    ///
-    /// # Safety
-    /// Writing to `ptr` must be safe, as if by `<*mut [T; N]>::write_unaligned`.
-    const unsafe fn store(self, ptr: *mut [T; N]) {
-        // SAFETY: `Simd<T, N>` always contains `N` elements of type `T`.  The safety of writing
-        // `ptr` is ensured by the caller.
-        unsafe { core::ptr::copy_nonoverlapping(self.as_array(), ptr, 1) }
-    }
-
     /// Converts an array to a SIMD vector.
     pub const fn from_array(array: [T; N]) -> Self {
         // SAFETY: `&array` is safe to read.
@@ -220,18 +208,7 @@ where
 
     /// Converts a SIMD vector to an array.
     pub const fn to_array(self) -> [T; N] {
-        let mut tmp = core::mem::MaybeUninit::uninit();
-        // SAFETY: writing to `tmp` is safe and initializes it.
-        //
-        // FIXME: We currently use a pointer store instead of `transmute_copy` because `repr(simd)`
-        // results in padding for non-power-of-2 vectors (so vectors are larger than arrays).
-        //
-        // NOTE: This deliberately doesn't just use `self.0`, see the comment
-        // on the struct definition for details.
-        unsafe {
-            self.store(tmp.as_mut_ptr());
-            tmp.assume_init()
-        }
+        *self.as_array()
     }
 
     /// Converts a slice to a SIMD vector containing `slice[..N]`.