Add macro to remove code duplication (#111)

Streamlines how mutation row objects are created.

Author: molpopgen

src/_macros.rs

@@ -168,6 +168,15 @@ macro_rules! decode_metadata_row {
     };
 }
 
+macro_rules! table_row_decode_metadata {
+    ($decode_metadata: ident, $table: ident, $pos: ident) => {
+        match $decode_metadata {
+            true => metadata_to_vector!($table, $pos).unwrap().map(|x| x),
+            false => None,
+        }
+    };
+}
+
 macro_rules! process_state_input {
     ($state: expr) => {
         match $state {

src/edge_table.rs

@@ -35,13 +35,7 @@ fn make_edge_table_row(
             right: table.right(pos).unwrap(),
             parent: table.parent(pos).unwrap(),
             child: table.child(pos).unwrap(),
-            metadata: match decode_metadata {
-                true => match metadata_to_vector!(table, pos).unwrap() {
-                    Some(x) => Some(x),
-                    None => None,
-                },
-                false => None,
-            },
+            metadata: table_row_decode_metadata!(decode_metadata, table, pos),
         };
         Some(rv)
     } else {

src/individual_table.rs

@@ -58,13 +58,7 @@ fn make_individual_table_row(
             flags: table.flags(pos).unwrap(),
             location: table.location(pos).unwrap(),
             parents: table.parents(pos).unwrap(),
-            metadata: match decode_metadata {
-                true => match metadata_to_vector!(table, pos).unwrap() {
-                    Some(x) => Some(x),
-                    None => None,
-                },
-                false => None,
-            },
+            metadata: table_row_decode_metadata!(decode_metadata, table, pos),
         };
         Some(rv)
     } else {

src/migration_table.rs

@@ -41,13 +41,7 @@ fn make_migration_table_row(
             source: table.source(pos).unwrap(),
             dest: table.dest(pos).unwrap(),
             time: table.time(pos).unwrap(),
-            metadata: match decode_metadata {
-                true => match metadata_to_vector!(table, pos).unwrap() {
-                    Some(x) => Some(x),
-                    None => None,
-                },
-                false => None,
-            },
+            metadata: table_row_decode_metadata!(decode_metadata, table, pos),
         })
     } else {
         None

src/mutation_table.rs

@@ -38,13 +38,7 @@ fn make_mutation_table_row(
             parent: table.parent(pos).unwrap(),
             time: table.time(pos).unwrap(),
             derived_state: table.derived_state(pos).unwrap(),
-            metadata: match decode_metadata {
-                true => match metadata_to_vector!(table, pos).unwrap() {
-                    Some(x) => Some(x),
-                    None => None,
-                },
-                false => None,
-            },
+            metadata: table_row_decode_metadata!(decode_metadata, table, pos),
         };
         Some(rv)
     } else {

src/node_table.rs

@@ -35,13 +35,7 @@ fn make_node_table_row(
             flags: table.flags(pos).unwrap(),
             population: table.population(pos).unwrap(),
             individual: table.individual(pos).unwrap(),
-            metadata: match decode_metadata {
-                true => match metadata_to_vector!(table, pos).unwrap() {
-                    Some(x) => Some(x),
-                    None => None,
-                },
-                false => None,
-            },
+            metadata: table_row_decode_metadata!(decode_metadata, table, pos),
         })
     } else {
         None

src/population_table.rs

@@ -24,13 +24,7 @@ fn make_population_table_row(
     if pos < table.num_rows() as tsk_id_t {
         let rv = PopulationTableRow {
             id: pos,
-            metadata: match decode_metadata {
-                true => match metadata_to_vector!(table, pos).unwrap() {
-                    Some(x) => Some(x),
-                    None => None,
-                },
-                false => None,
-            },
+            metadata: table_row_decode_metadata!(decode_metadata, table, pos),
         };
         Some(rv)
     } else {

src/site_table.rs

@@ -30,13 +30,7 @@ fn make_site_table_row(
             id: pos,
             position: table.position(pos).unwrap(),
             ancestral_state: table.ancestral_state(pos).unwrap(),
-            metadata: match decode_metadata {
-                true => match metadata_to_vector!(table, pos).unwrap() {
-                    Some(x) => Some(x),
-                    None => None,
-                },
-                false => None,
-            },
+            metadata: table_row_decode_metadata!(decode_metadata, table, pos),
         };
         Some(rv)
     } else {