Merge pull request #172 from paritytech/func-serde

Dedicated serialize/deserialze for Func struct

src/elements/func.rs

@@ -23,6 +23,22 @@ impl Func {
 	}
 }
 
+impl Serialize for Func {
+	type Error = Error;
+
+	fn serialize<W: io::Write>(self, writer: &mut W) -> Result<(), Self::Error> {
+		VarUint32::from(self.0).serialize(writer)
+	}
+}
+
+impl Deserialize for Func {
+	 type Error = Error;
+
+	fn deserialize<R: io::Read>(reader: &mut R) -> Result<Self, Self::Error> {
+		Ok(Func(VarUint32::deserialize(reader)?.into()))
+	}
+}
+
 /// Local definition inside the function body.
 #[derive(Debug, Copy, Clone)]
 pub struct Local {

src/elements/section.rs

@@ -398,11 +398,8 @@ impl Deserialize for FunctionSection {
 	fn deserialize<R: io::Read>(reader: &mut R) -> Result<Self, Self::Error> {
 		// todo: maybe use reader.take(section_length)
 		let _section_length = VarUint32::deserialize(reader)?;
-		let funcs: Vec<Func> = CountedList::<VarUint32>::deserialize(reader)?
+		let funcs: Vec<Func> = CountedList::<Func>::deserialize(reader)?
-			.into_inner()
+			.into_inner();
-			.into_iter()
-			.map(|f| Func::new(f.into()))
-			.collect();
 		Ok(FunctionSection(funcs))
 	}
 }