cleanup

Author: molpopgen

examples/manual_metadata_encoding.rs

@@ -10,8 +10,8 @@ struct MutationMetadata {
 impl MetadataRoundtrip for MutationMetadata {
     fn encode(&self) -> Result<Vec<u8>, tskit::metadata::MetadataError> {
         let mut rv = vec![];
-        rv.extend_from_slice(&self.effect_size.to_be_bytes());
-        rv.extend_from_slice(&self.dominance.to_be_bytes());
+        rv.extend_from_slice(&self.effect_size.to_le_bytes());
+        rv.extend_from_slice(&self.dominance.to_le_bytes());
         Ok(rv)
     }
 
@@ -20,9 +20,9 @@ impl MetadataRoundtrip for MutationMetadata {
         Self: Sized,
     {
         let slice: [u8; 8] = md[0..8].try_into().unwrap();
-        let effect_size = f64::from_be_bytes(slice);
+        let effect_size = f64::from_le_bytes(slice);
         let slice: [u8; 8] = md[8..].try_into().unwrap();
-        let dominance = f64::from_be_bytes(slice);
+        let dominance = f64::from_le_bytes(slice);
         Ok(Self {
             effect_size,
             dominance,
@@ -40,12 +40,11 @@ struct IndividualMetadata {
 impl MetadataRoundtrip for IndividualMetadata {
     fn encode(&self) -> Result<Vec<u8>, tskit::metadata::MetadataError> {
         let mut rv = vec![];
-        rv.extend_from_slice(self.name.len().to_be_bytes().as_slice());
+        rv.extend_from_slice(self.name.len().to_le_bytes().as_slice());
         rv.extend_from_slice(self.name.as_bytes());
-        println!("{} {:?}", self.name, self.name.as_bytes());
-        rv.extend_from_slice(self.phenotypes.len().to_be_bytes().as_slice());
+        rv.extend_from_slice(self.phenotypes.len().to_le_bytes().as_slice());
         for i in self.phenotypes.iter() {
-            rv.extend_from_slice(i.to_be_bytes().as_slice());
+            rv.extend_from_slice(i.to_le_bytes().as_slice());
         }
         Ok(rv)
     }
@@ -55,7 +54,7 @@ impl MetadataRoundtrip for IndividualMetadata {
     {
         let size: [u8; std::mem::size_of::<usize>()] =
             md[0..std::mem::size_of::<usize>()].try_into().unwrap();
-        let size = usize::from_be_bytes(size);
+        let size = usize::from_le_bytes(size);
         let name =
             str::from_utf8(&md[std::mem::size_of::<usize>()..size + std::mem::size_of::<usize>()])
                 .unwrap()
@@ -65,14 +64,14 @@ impl MetadataRoundtrip for IndividualMetadata {
             [offset..offset + std::mem::size_of::<usize>()]
             .try_into()
             .unwrap();
-        let size = usize::from_be_bytes(size);
+        let size = usize::from_le_bytes(size);
         let mut offset = offset + std::mem::size_of::<usize>();
         let mut phenotypes = vec![];
         for _ in 0..size {
             let p: [u8; 4] = md[offset..offset + std::mem::size_of::<i32>()]
                 .try_into()
                 .unwrap();
-            phenotypes.push(i32::from_be_bytes(p));
+            phenotypes.push(i32::from_le_bytes(p));
             offset += std::mem::size_of::<i32>();
         }
         Ok(Self { name, phenotypes })