more

Author: molpopgen

src/sys/node_table.rs

@@ -1,9 +1,9 @@
 use std::ptr::NonNull;
 
-use crate::IndividualId;
-use crate::NodeFlags;
-use crate::PopulationId;
-use crate::Time;
+use super::flags::NodeFlags;
+use super::newtypes::IndividualId;
+use super::newtypes::PopulationId;
+use super::newtypes::Time;
 
 use super::bindings::tsk_node_table_add_row;
 use super::bindings::tsk_node_table_clear;
@@ -114,20 +114,20 @@ impl NodeTable {
         }
     }
 
-    pub fn individual(&self, row: NodeId)  -> Option<IndividualId> {
-        safe_tsk_column_access!(self, row, IndividualId, individual )
+    pub fn individual(&self, row: NodeId) -> Option<IndividualId> {
+        safe_tsk_column_access!(self, row, IndividualId, individual)
     }
 
-    pub fn population(&self, row: NodeId)  -> Option<PopulationId> {
-        safe_tsk_column_access!(self, row, PopulationId, population )
+    pub fn population(&self, row: NodeId) -> Option<PopulationId> {
+        safe_tsk_column_access!(self, row, PopulationId, population)
     }
 
-    pub fn time(&self, row: NodeId)  -> Option<Time> {
-        safe_tsk_column_access!(self, row, Time, time )
+    pub fn time(&self, row: NodeId) -> Option<Time> {
+        safe_tsk_column_access!(self, row, Time, time)
     }
 
-    pub fn flags(&self, row: NodeId)  -> Option<NodeFlags> {
-        safe_tsk_column_access!(self, row, NodeFlags, flags )
+    pub fn flags(&self, row: NodeId) -> Option<NodeFlags> {
+        safe_tsk_column_access!(self, row, NodeFlags, flags)
     }
 }