add generic-array support

Author: wwylele

byte_struct/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "byte_struct"
-version = "0.4.2"
+version = "0.5.0"
 authors = ["Weiyi Wang <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -12,5 +12,6 @@ readme = "../README.md"
 
 [dependencies]
 byte_struct_derive = { version = "0.4.2", path = "../byte_struct_derive" }
+generic-array = "0.13"
 
 [dev-dependencies]

byte_struct/src/lib.rs

@@ -49,6 +49,7 @@
 //! ```
 
 pub use byte_struct_derive::{ByteStruct, ByteStructBE, ByteStructLE};
+use generic_array::*;
 
 /// A type that can be packed into or unpacked from fixed-size bytes, but the method is unknown yet.
 pub trait ByteStructLen {
@@ -454,6 +455,55 @@ bsa5!(1);
 byte_struct_array!(100);
 byte_struct_array!(3000);
 
+impl<T: ByteStructLen, U: ArrayLength<T>> ByteStructLen for GenericArray<T, U> {
+    const BYTE_LEN: usize = T::BYTE_LEN * U::USIZE;
+}
+
+impl<T: ByteStructUnspecifiedByteOrder, U: ArrayLength<T>> ByteStructUnspecifiedByteOrder for GenericArray<T, U> {
+    fn write_bytes_default_le(&self, bytes: &mut [u8]) {
+        let mut pos = 0;
+        let len = T::BYTE_LEN;
+        for i in 0 .. U::USIZE {
+            self[i].write_bytes_default_le(&mut bytes[pos .. pos + len]);
+            pos += len;
+        }
+    }
+    fn read_bytes_default_le(bytes: &[u8]) -> Self {
+        let mut pos = 0;
+        let len = T::BYTE_LEN;
+        let mut result: Self;
+        unsafe {
+            result = std::mem::uninitialized();
+            for i in 0 .. U::USIZE {
+                std::ptr::write(&mut result[i], <T>::read_bytes_default_le(&bytes[pos .. pos + len]));
+                pos += len;
+            }
+        }
+        result
+    }
+    fn write_bytes_default_be(&self, bytes: &mut [u8]) {
+        let mut pos = 0;
+        let len = T::BYTE_LEN;
+        for i in 0 .. U::USIZE {
+            self[i].write_bytes_default_be(&mut bytes[pos .. pos + len]);
+            pos += len;
+        }
+    }
+    fn read_bytes_default_be(bytes: &[u8]) -> Self {
+        let mut pos = 0;
+        let len = T::BYTE_LEN;
+        let mut result: Self;
+        unsafe {
+            result = std::mem::uninitialized();
+            for i in 0 .. U::USIZE {
+                std::ptr::write(&mut result[i], <T>::read_bytes_default_be(&bytes[pos .. pos + len]));
+                pos += len;
+            }
+        }
+        result
+    }
+}
+
 /// Generates a structure that implements [`ByteStructUnspecifiedByteOrder`] with bit field semantics.
 ///
 /// The bit fields are packed to / unpacked from the base integer type,
@@ -468,7 +518,7 @@ byte_struct_array!(3000);
 /// [`ByteStructUnspecifiedByteOrder`]: trait.ByteStructUnspecifiedByteOrder.html
 ///
 /// # Example
-/// ```
+/// ```ignore
 /// bitfields!(
 ///     // Specifies the struct name and the base type.
 ///     // The base type must be one of unsigned integer types.

byte_struct_derive/src/lib.rs

@@ -48,7 +48,7 @@ enum Endianness {
 /// [`ByteStructUnspecifiedByteOrder`]: https://docs.rs/byte_struct/*/byte_struct/trait.ByteStructUnspecifiedByteOrder.html
 ///
 /// ## Example
-/// ```
+/// ```ignore
 /// #[derive(ByteStruct)]
 /// #[byte_struct_le]
 /// struct Struct1 {

tests/Cargo.toml

@@ -7,3 +7,4 @@ publish = false
 
 [dependencies]
 byte_struct = {path = "../byte_struct"}
+generic-array = "0.13"

tests/src/main.rs

@@ -1,4 +1,5 @@
 use byte_struct::*;
+use generic_array::*;
 
 bitfields!(
     #[derive(PartialEq, Debug)]
@@ -33,7 +34,7 @@ struct TestSubStruct3 {
 struct TestStruct {
     a: u8,
     s: TestSubStruct3,
-    d: [u16; 3],
+    d: GenericArray<u16, typenum::U3>,
     e: u32,
     f: u64,
     #[byte_struct_be] g: u128,
@@ -68,7 +69,7 @@ fn main() {
                 v: 0x5040
             },
         },
-        d: [0x1020, 0x3040, 0x5060],
+        d: *GenericArray::from_slice(&[0x1020, 0x3040, 0x5060]),
         e: 0x9abcdef0,
         f: 0x0123456789ABCDEF,
         g: 0xffeeddccbbaa99887766554433221100,
@@ -129,7 +130,7 @@ fn main() {
                 v: 0xfedc,
             },
         },
-        d: [0x5544, 0x7766, 0x9988],
+        d: *GenericArray::from_slice(&[0x5544, 0x7766, 0x9988]),
         e: 0xddccbbaa,
         f: 0x8171615140302010,
         g: 0x11121314252627283132333445464748,