Merge pull request #27 from molpopgen/fix_example_file_names

Fix swapped example file names. Fixes #26

Author: molpopgen

examples/mutation_metadata_bincode.rs

@@ -4,25 +4,16 @@ mod mutation;
 
 use mutation::Mutation;
 
+// Implement the metadata trait for our mutation
+// type.  Will will use the standard library for the implementation
+// details.
 impl metadata::MetadataRoundtrip for Mutation {
     fn encode(&self) -> Result<Vec<u8>, metadata::MetadataError> {
-        let mut rv = vec![];
-        rv.extend(self.effect_size.to_le_bytes().iter().copied());
-        rv.extend(self.dominance.to_le_bytes().iter().copied());
-        rv.extend(self.origin_time.to_le_bytes().iter().copied());
-        Ok(rv)
+        Ok(bincode::serialize(&self).unwrap())
     }
 
     fn decode(md: &[u8]) -> Result<Self, metadata::MetadataError> {
-        use std::convert::TryInto;
-        let (effect_size_bytes, rest) = md.split_at(std::mem::size_of::<f64>());
-        let (dominance_bytes, rest) = rest.split_at(std::mem::size_of::<f64>());
-        let (origin_time_bytes, _) = rest.split_at(std::mem::size_of::<i32>());
-        Ok(Self {
-            effect_size: f64::from_le_bytes(effect_size_bytes.try_into().unwrap()),
-            dominance: f64::from_le_bytes(dominance_bytes.try_into().unwrap()),
-            origin_time: i32::from_le_bytes(origin_time_bytes.try_into().unwrap()),
-        })
+        Ok(bincode::deserialize(md).unwrap())
     }
 }
 

examples/mutation_metadata_std.rs

@@ -4,16 +4,25 @@ mod mutation;
 
 use mutation::Mutation;
 
-// Implement the metadata trait for our mutation
-// type.  Will will use the standard library for the implementation
-// details.
 impl metadata::MetadataRoundtrip for Mutation {
     fn encode(&self) -> Result<Vec<u8>, metadata::MetadataError> {
-        Ok(bincode::serialize(&self).unwrap())
+        let mut rv = vec![];
+        rv.extend(self.effect_size.to_le_bytes().iter().copied());
+        rv.extend(self.dominance.to_le_bytes().iter().copied());
+        rv.extend(self.origin_time.to_le_bytes().iter().copied());
+        Ok(rv)
     }
 
     fn decode(md: &[u8]) -> Result<Self, metadata::MetadataError> {
-        Ok(bincode::deserialize(md).unwrap())
+        use std::convert::TryInto;
+        let (effect_size_bytes, rest) = md.split_at(std::mem::size_of::<f64>());
+        let (dominance_bytes, rest) = rest.split_at(std::mem::size_of::<f64>());
+        let (origin_time_bytes, _) = rest.split_at(std::mem::size_of::<i32>());
+        Ok(Self {
+            effect_size: f64::from_le_bytes(effect_size_bytes.try_into().unwrap()),
+            dominance: f64::from_le_bytes(dominance_bytes.try_into().unwrap()),
+            origin_time: i32::from_le_bytes(origin_time_bytes.try_into().unwrap()),
+        })
     }
 }