clip

Author: molpopgen

src/trees/tree.rs

@@ -331,7 +331,7 @@ impl<'treeseq> Tree<'treeseq> {
         self.inner.parents(u.into())
     }
 
-    pub fn as_ref(&self) -> &ll_bindings::tsk_tree_t {
+    pub fn as_ll_ref(&self) -> &ll_bindings::tsk_tree_t {
         self.inner.as_ref()
     }
 }

tests/test_trees.rs

@@ -326,14 +326,14 @@ fn test_iterate_samples_two_trees() {
         {
             let mut nodes: Vec<NodeId> = vec![
                 NodeId::NULL;
-                unsafe { tskit::bindings::tsk_tree_get_size_bound(tree.as_ref()) }
+                unsafe { tskit::bindings::tsk_tree_get_size_bound(tree.as_ll_ref()) }
                     as usize
             ];
             let mut num_nodes: tskit::bindings::tsk_size_t = 0;
             let ptr = std::ptr::addr_of_mut!(num_nodes);
             unsafe {
                 tskit::bindings::tsk_tree_preorder(
-                    tree.as_ref(),
+                    tree.as_ll_ref(),
                     nodes.as_mut_ptr() as *mut tskit::bindings::tsk_id_t,
                     ptr,
                 );