tryfrom

Author: molpopgen

src/_macros.rs

@@ -676,12 +676,13 @@ macro_rules! node_table_add_row_with_metadata {
             M: $crate::metadata::NodeMetadata,
         {
             let md = $crate::metadata::EncodedMetadata::new(metadata)?;
+            let mdlen = md.len()?;
             node_table_add_row_details!(flags,
                                         time,
                                         population,
                                         individual,
                                         md.as_ptr(),
-                                        md.len().into(),
+                                        mdlen.into(),
                                         $table)
         }
     };
@@ -761,7 +762,7 @@ macro_rules! edge_table_add_row_with_metadata {
                                         parent,
                                         child,
                                         md.as_ptr(),
-                                        md.len().into(),
+                                        md.len()?.into(),
                                         $table)
         }
     };
@@ -791,7 +792,7 @@ macro_rules! population_table_add_row_with_metadata {
         pub fn $name<M>(&mut $self, metadata: &M) -> Result<$crate::PopulationId, $crate::TskitError>
         where M: $crate::metadata::PopulationMetadata {
             let md = $crate::metadata::EncodedMetadata::new(metadata)?;
-            population_table_add_row_details!(md.as_ptr(), md.len().into(), $table)
+            population_table_add_row_details!(md.as_ptr(), md.len()?.into(), $table)
         }
     };
 }
@@ -865,7 +866,7 @@ macro_rules! individual_table_add_row_with_metadata {
                                                   location,
                                                   parents,
                                                   md.as_ptr(),
-                                                  md.len().into(),
+                                                  md.len()?.into(),
                                                   $table)
             }
     };
@@ -946,7 +947,7 @@ macro_rules! mutation_table_add_row_with_metadata {
                                             time,
                                             derived_state,
                                             md.as_ptr(),
-                                            md.len().into(),
+                                            md.len()?.into(),
                                             $table)
         }
     };
@@ -1002,7 +1003,7 @@ macro_rules! site_table_add_row_with_metadata {
             let md = $crate::metadata::EncodedMetadata::new(metadata)?;
             site_table_add_row_details!(position, ancestral_state,
                                         md.as_ptr(),
-                                        md.len().into(),
+                                        md.len()?.into(),
                                         $table)
         }
     };
@@ -1076,7 +1077,7 @@ macro_rules! migration_table_add_row_with_metadata {
         {
             let md = $crate::metadata::EncodedMetadata::new(metadata)?;
             migration_table_add_row_details!(span, node, source_dest, time,
-                                             md.as_ptr(), md.len().into(), $table)
+                                             md.as_ptr(), md.len()?.into(), $table)
         }
     };
 }

src/lib.rs

@@ -297,9 +297,17 @@ impl TryFrom<SizeType> for usize {
     }
 }
 
-impl From<usize> for SizeType {
-    fn from(value: usize) -> Self {
-        Self(value as tsk_size_t)
+impl TryFrom<usize> for SizeType {
+    type Error = TskitError;
+
+    fn try_from(value: usize) -> Result<Self, Self::Error> {
+        match tsk_size_t::try_from(value) {
+            Ok(x) => Ok(Self(x)),
+            Err(_) => Err(TskitError::RangeError(format!(
+                "could not convert usize {} to SizeType",
+                value
+            ))),
+        }
     }
 }
 
@@ -542,17 +550,17 @@ mod tests {
 #[test]
 fn test_usize_to_size_type() {
     let x = usize::MAX;
-    let s = SizeType::from(x);
+    let s = SizeType::try_from(x).ok();
 
     #[cfg(target_pointer_width = "64")]
-    assert_eq!(s, bindings::tsk_size_t::MAX);
+    assert_eq!(s, Some(bindings::tsk_size_t::MAX.into()));
 
     #[cfg(target_pointer_width = "32")]
-    assert_eq!(s, usize::MAX as bindings::tsk_size_t);
+    assert_eq!(s, Some((usize::MAX as bindings::tsk_size_t).into()));
 
     let x = usize::MIN;
-    let s = SizeType::from(x);
-    assert_eq!(s, 0);
+    let s = SizeType::try_from(x).ok();
+    assert_eq!(s, Some(0.into()));
 }
 
 // Testing modules

src/metadata.rs

@@ -234,8 +234,8 @@ impl EncodedMetadata {
         }
     }
 
-    pub(crate) fn len(&self) -> SizeType {
-        self.encoded.len().into()
+    pub(crate) fn len(&self) -> Result<SizeType, crate::TskitError> {
+        SizeType::try_from(self.encoded.len())
     }
 }
 
@@ -365,7 +365,7 @@ mod tests {
         let enc = EncodedMetadata::new(&f).unwrap();
         let p = enc.as_ptr();
         let mut d = vec![];
-        for i in 0..usize::try_from(enc.len()).unwrap() {
+        for i in 0..usize::try_from(enc.len().unwrap()).unwrap() {
             d.push(unsafe { *p.add(i) as u8 });
         }
         let df = F::decode(&d).unwrap();
@@ -399,7 +399,7 @@ mod test_serde {
         let enc = EncodedMetadata::new(&f).unwrap();
         let p = enc.as_ptr();
         let mut d = vec![];
-        for i in 0..usize::try_from(enc.len()).unwrap() {
+        for i in 0..usize::try_from(enc.len().unwrap()).unwrap() {
             d.push(unsafe { *p.add(i) as u8 });
         }
         let df = F::decode(&d).unwrap();