Merge branch 'main' into use-core-more-broadly

src/index.rs

@@ -1,3 +1,5 @@
+use camino::Utf8PathBuf as PathBuf;
+use sourmash::collection::Collection;
 use sourmash::index::revindex::RevIndex;
 use sourmash::prelude::*;
 use std::path::Path;

src/lib.rs

@@ -17,6 +17,8 @@ mod mastiff_manygather;
 mod mastiff_manysearch;
 mod multisearch;
 mod pairwise;
+use sourmash::encodings::HashFunctions;
+use sourmash::selection::Selection;
 
 use camino::Utf8PathBuf as PathBuf;
 

src/mastiff_manygather.rs

@@ -84,8 +84,6 @@ pub fn mastiff_manygather(
                                     intersect_bp: match_.intersect_bp(),
                                 });
                             }
-                        } else {
-                            eprintln!("Error gathering matches: {:?}", matches.err());
                         }
                     } else {
                         eprintln!(

src/mastiff_manysearch.rs

@@ -25,6 +25,7 @@ pub fn mastiff_manysearch(
     }
     // Open database once
     let db = RevIndex::open(index, true)?;
+
     println!("Loaded DB");
 
     // Load query paths

src/python/tests/test_index.py

@@ -133,7 +133,6 @@ def test_index_empty_siglist(runtmp, capfd):
     output = runtmp.output('out.db')
     make_file_list(siglist, []) # empty
 
-
     with pytest.raises(utils.SourmashCommandFailed):
         runtmp.sourmash('scripts', 'index', siglist,
                         '-o', output)