Simplify DynArray implementation using derive_more

bff-cli/src/main.rs

@@ -19,9 +19,7 @@ enum Commands {
         directory: PathBuf,
     },
     #[clap(alias = "t")]
-    Info {
-        bigfile: PathBuf,
-    },
+    Info { bigfile: PathBuf },
     Crc32 {
         string: Option<String>,
         #[arg(

bff/src/dynarray.rs

@@ -1,13 +1,14 @@
 use std::convert::TryFrom;
 use std::fmt::Debug;
 use std::marker::PhantomData;
-use std::ops::Deref;
 
 use binrw::{binread, BinRead};
-use serde::{Serialize, Serializer};
+use derive_more::Deref;
+use serde::Serialize;
 
 #[binread]
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deref)]
+#[serde(transparent)]
 pub struct DynArray<InnerType, SizeType = u32>
 where
     // This code is ugly but the pretty syntax isn't stable yet
@@ -21,40 +22,9 @@ where
 {
     #[br(temp)]
     size: SizeType,
+    #[deref]
     #[br(count = size)]
     data: Vec<InnerType>,
+    #[serde(skip)]
     _phantom: PhantomData<SizeType>,
 }
-
-impl<InnerType, SizeType> Serialize for DynArray<InnerType, SizeType>
-where
-    for<'a> InnerType: BinRead + Serialize + 'a,
-    for<'a> <InnerType as BinRead>::Args<'a>: Clone + Default,
-
-    SizeType: BinRead + Debug + Copy,
-    for<'a> <SizeType as BinRead>::Args<'a>: Default,
-    usize: TryFrom<SizeType>,
-{
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        self.data.serialize(serializer)
-    }
-}
-
-impl<InnerType, SizeType> Deref for DynArray<InnerType, SizeType>
-where
-    for<'a> InnerType: BinRead + Serialize + 'a,
-    for<'a> <InnerType as BinRead>::Args<'a>: Clone + Default,
-
-    SizeType: BinRead + Debug + Copy,
-    for<'a> <SizeType as BinRead>::Args<'a>: Default,
-    usize: TryFrom<SizeType>,
-{
-    type Target = Vec<InnerType>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.data
-    }
-}