From dc15261ec15da0797dad8d3687b247db2c26ca4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crozet=20S=C3=A9bastien?= <developer@crozet.re>
Date: Thu, 25 Feb 2021 14:10:34 +0100
Subject: [PATCH] Move the bytemuck impls to GenericArray and add a transitive
 impl for matrices.

---
 src/base/array_storage.rs | 20 ++++++++++++++++++++
 src/base/matrix.rs        | 15 ++++++---------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/base/array_storage.rs b/src/base/array_storage.rs
index 4fdd3e73..e067cb49 100644
--- a/src/base/array_storage.rs
+++ b/src/base/array_storage.rs
@@ -394,6 +394,26 @@ where
     }
 }
 
+#[cfg(feature = "bytemuck")]
+unsafe impl<N: Scalar + bytemuck::Zeroable, R: DimName, C: DimName> bytemuck::Zeroable
+    for ArrayStorage<N, R, C>
+where
+    R::Value: Mul<C::Value>,
+    Prod<R::Value, C::Value>: ArrayLength<N>,
+    Self: Copy,
+{
+}
+
+#[cfg(feature = "bytemuck")]
+unsafe impl<N: Scalar + bytemuck::Pod, R: DimName, C: DimName> bytemuck::Pod
+    for ArrayStorage<N, R, C>
+where
+    R::Value: Mul<C::Value>,
+    Prod<R::Value, C::Value>: ArrayLength<N>,
+    Self: Copy,
+{
+}
+
 #[cfg(feature = "abomonation-serialize")]
 impl<N, R, C> Abomonation for ArrayStorage<N, R, C>
 where
diff --git a/src/base/matrix.rs b/src/base/matrix.rs
index 73001536..eb525b14 100644
--- a/src/base/matrix.rs
+++ b/src/base/matrix.rs
@@ -280,21 +280,18 @@ impl<N: Scalar, R: Dim, C: Dim, S: Storage<N, R, C>> matrixcompare_core::DenseAc
 }
 
 #[cfg(feature = "bytemuck")]
-unsafe impl<N: Scalar + Copy, R: crate::base::dimension::DimName, C: crate::base::dimension::DimName>
-    bytemuck::Zeroable for Matrix<N, R, C, crate::base::ArrayStorage<N, R, C>>
+unsafe impl<N: Scalar, R: Dim, C: Dim, S: Storage<N, R, C>> bytemuck::Zeroable
+    for Matrix<N, R, C, S>
 where
-    R::Value: core::ops::Mul<C::Value>,
-    <R::Value as core::ops::Mul<C::Value>>::Output: generic_array::ArrayLength<N>,
+    S: bytemuck::Zeroable,
 {
 }
 
 #[cfg(feature = "bytemuck")]
-unsafe impl<N: Scalar + Copy, R: crate::base::dimension::DimName, C: crate::base::dimension::DimName>
-    bytemuck::Pod for Matrix<N, R, C, crate::base::ArrayStorage<N, R, C>>
+unsafe impl<N: Scalar, R: Dim, C: Dim, S: Storage<N, R, C>> bytemuck::Pod for Matrix<N, R, C, S>
 where
-    R::Value: core::ops::Mul<C::Value>,
-    <R::Value as core::ops::Mul<C::Value>>::Output: generic_array::ArrayLength<N>,
-    <<R::Value as core::ops::Mul<<C as crate::base::dimension::DimName>::Value>>::Output as generic_array::ArrayLength<N>>::ArrayType: Copy
+    S: bytemuck::Pod,
+    Self: Copy,
 {
 }