Use bindgen to expose tskit's guts.

Author: molpopgen

Cargo.toml

@@ -10,5 +10,6 @@ edition = "2018"
 [dependencies]
 
 [build-dependencies]
+bindgen = "0.56.0"
 cc = { version = "1.0", features = ["parallel"] }
 pkg-config = "0.3"

build.rs

@@ -1,8 +1,8 @@
+extern crate bindgen;
 use std::path::Path;
 
 fn main() {
-    pkg_config::Config::new()
-        .atleast_version("1.2");
+    pkg_config::Config::new().atleast_version("1.2");
 
     let src = [
         "subprojects/tskit/c/tskit/convert.c",
@@ -24,4 +24,29 @@ fn main() {
         .include(kastore_path)
         .flag("-Wno-unused-parameter");
     build.compile("tskit");
+
+    // The bindgen::Builder is the main entry point
+    // to bindgen, and lets you build up options for
+    // the resulting bindings.
+    let bindings = bindgen::Builder::default()
+        // The input header we would like to generate
+        // bindings for.
+        .header("wrapper.h")
+        .clang_arg("-Isubprojects/tskit/c")
+        .clang_arg("-Isubprojects/tskit/c/subprojects/kastore")
+        .whitelist_type("tsk.*")
+        .whitelist_function("tsk.*")
+        // Tell cargo to invalidate the built crate whenever any of the
+        // included header files changed.
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        // Finish the builder and generate the bindings.
+        .generate()
+        // Unwrap the Result and panic on failure.
+        .expect("Unable to generate bindings");
+
+    // Write the bindings to the $OUT_DIR/bindings.rs file.
+    //let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());
+    bindings
+        .write_to_file("src/bindings.rs")
+        .expect("Couldn't write bindings!");
 }

src/lib.rs

@@ -1,7 +1,10 @@
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+//mod bindings;
+
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+
+include!("bindings.rs");
+
+// Testing modules
+mod test_table_collection;

src/test_table_collection.rs

@@ -0,0 +1,16 @@
+#[cfg(test)]
+mod tests {
+    use crate::*;
+    use std::mem::MaybeUninit;
+
+    #[test]
+    fn test_add_edge_table_rows() -> () {
+        let mut edges: MaybeUninit<tsk_edge_table_t> = MaybeUninit::uninit();
+        unsafe {
+            let mut rv = tsk_edge_table_init(edges.as_mut_ptr(), 0);
+            rv = tsk_edge_table_add_row(edges.as_mut_ptr(), 0., 10., 0, 1, std::ptr::null(), 0);
+            assert_eq!((*edges.as_ptr()).num_rows, 1);
+            tsk_edge_table_free(edges.as_mut_ptr());
+        }
+    }
+}

wrapper.h

@@ -0,0 +1 @@
+#include <tskit.h>