Deps: update to rocksdb 0.23

.github/workflows/rust.yml

@@ -217,12 +217,12 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.66.0"
+          toolchain: "1.71.1"
 
       - uses: Swatinem/rust-cache@v2
 
       - name: check if README matches MSRV defined here
-        run: grep '1.66.0' src/core/README.md
+        run: grep '1.71.1' src/core/README.md
 
       - name: Check if it builds properly
         run: |

.readthedocs.yml

@@ -8,7 +8,7 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.10"
-    rust: "1.70"
+    rust: "1.75"
   apt_packages:
     - llvm-dev
     - libclang-dev

flake.nix

@@ -127,7 +127,7 @@
             #cargo-llvm-cov
             cargo-component
             cargo-codspeed
-            cargo-semver-checks
+            #cargo-semver-checks
             nixpkgs-fmt
           ];
 

src/core/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2021"
 readme = "README.md"
 autoexamples = false
 autobins = false
-rust-version = "1.66.0"
+rust-version = "1.71.1"
 
 [lib]
 name = "sourmash"
@@ -108,7 +108,11 @@ chrono = { version = "0.4.32", features = ["wasmbind"] }
 wasm-bindgen-test = "0.3.42"
 
 ### These crates don't compile on wasm
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rocksdb = { version = "0.22.0", optional = true }
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.rocksdb]
+version = "0.23.0"
+optional = true
+default-features = false
+features = [ "bindgen-runtime", "snappy", "zstd" ]
+
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 criterion = "0.5.1"

src/core/README.md

@@ -38,4 +38,4 @@ Development happens on github at
 
 ## Minimum supported Rust version
 
-Currently the minimum supported Rust version is 1.66.0.
+Currently the minimum supported Rust version is 1.71.1.

src/core/src/encodings.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::hash::{BuildHasher, BuildHasherDefault, Hash, Hasher};
+use std::hash::{BuildHasher, BuildHasherDefault, Hash};
 use std::str;
 
 use nohash_hasher::BuildNoHashHasher;
@@ -469,9 +469,7 @@ impl Colors {
 
     fn compute_color(idxs: &IdxTracker) -> Color {
         let s = BuildHasherDefault::<twox_hash::Xxh3Hash128>::default();
-        let mut hasher = s.build_hasher();
-        idxs.0.hash(&mut hasher);
-        hasher.finish()
+        s.hash_one(&idxs.0)
     }
 
     pub fn len(&self) -> usize {

src/core/src/index/revindex/disk_revindex.rs

@@ -1,5 +1,5 @@
 use std::cmp::max;
-use std::hash::{BuildHasher, BuildHasherDefault, Hash, Hasher};
+use std::hash::{BuildHasher, BuildHasherDefault};
 use std::path::Path;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, RwLock};
@@ -30,9 +30,7 @@ const DB_VERSION: u8 = 1;
 
 fn compute_color(idxs: &Datasets) -> Color {
     let s = BuildHasherDefault::<twox_hash::Xxh3Hash128>::default();
-    let mut hasher = s.build_hasher();
-    idxs.hash(&mut hasher);
-    hasher.finish()
+    s.hash_one(idxs)
 }
 
 #[derive(Clone)]
@@ -354,8 +352,7 @@ impl RevIndexOps for RevIndex {
 
                     let name = [row.name(), row.filename(), row.md5()]
                         .into_iter()
-                        .skip_while(|v| v.is_empty())
-                        .next()
+                        .find(|v| !v.is_empty())
                         .unwrap(); // guaranteed to succeed because `md5` always exists
 
                     Some((name.into(), size))