Merge branch 'upd-smash-core' into maturin-wheels

Cargo.toml

@@ -12,7 +12,9 @@ crate-type = ["cdylib"]
 pyo3 = { version = "0.19.2", features = ["extension-module", "anyhow"] }
 rayon = "1.8.0"
 serde = { version = "1.0.136", features = ["derive"] }
-sourmash = { git = "https://github.com/sourmash-bio/sourmash", "rev" = "ff1092f8f366339caa59d7203f623813228f4356" }
+#sourmash = { git = "https://github.com/sourmash-bio/sourmash", "rev" = "ff1092f8f366339caa59d7203f623813228f4356" }
+#sourmash = { git = "https://github.com/sourmash-bio/sourmash", branch = "lirber/mastiff", features = ["branchwater"] }
+sourmash = { path = "../sourmash/src/core", features = ["branchwater"] } 
 serde_json = "1.0.107"
 niffler = "2.4.0"
 log = "0.4.14"
@@ -23,6 +25,7 @@ zip = "0.6"
 tempfile = "3.8"
 needletail = "0.5.1"
 csv = "1.2.2"
+camino = "1.1.6"
 
 [dev-dependencies]
 assert_cmd = "2.0.4"

src/check.rs

@@ -2,7 +2,8 @@ use std::path::Path;
 
 use crate::utils::is_revindex_database;
 
-use sourmash::index::revindex::RevIndex;
+use sourmash::index::revindex::{RevIndex, RevIndexOps};
+
 
 pub fn check<P: AsRef<Path>>(index: P, quick: bool) -> Result<(), Box<dyn std::error::Error>> {
     if !is_revindex_database(index.as_ref()) {
@@ -13,7 +14,7 @@ pub fn check<P: AsRef<Path>>(index: P, quick: bool) -> Result<(), Box<dyn std::e
     }
 
     println!("Opening DB");
-    let db = RevIndex::open(index.as_ref(), true);
+    let db = RevIndex::open(index.as_ref(), true)?;
 
     println!("Starting check");
     db.check(quick);