From 4b0e7e4e4d54f7f2431f1f9f4bc901d571a9f3b7 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 28 Oct 2024 17:58:37 +0100 Subject: [PATCH 1/2] upgrade rocksdb to 0.22.0 --- Cargo.lock | 33 ++++++++------------------------- src/core/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 931de74a0..06ab8e9bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,17 +90,16 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.65.1" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", - "prettyplease", "proc-macro2", "quote", "regex", @@ -844,9 +843,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "librocksdb-sys" -version = "0.11.0+8.1.1" +version = "0.16.0+8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" +checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c" dependencies = [ "bindgen", "bzip2-sys", @@ -1163,12 +1162,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "piz" version = "0.5.1" @@ -1225,16 +1218,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "prettyplease" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" -dependencies = [ - "proc-macro2", - "syn 2.0.87", -] - [[package]] name = "primal-check" version = "0.3.4" @@ -1485,9 +1468,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +checksum = "6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7" dependencies = [ "libc", "librocksdb-sys", diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 7167f3916..8b8bab2a1 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -109,6 +109,6 @@ wasm-bindgen-test = "0.3.42" ### These crates don't compile on wasm [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -rocksdb = { version = "0.21.0", optional = true } +rocksdb = { version = "0.22.0", optional = true } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] criterion = "0.5.1" From 399776a4e62d89e1d75cf3523062d49b46464a14 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Thu, 7 Nov 2024 17:02:30 +0100 Subject: [PATCH 2/2] bump msrv to 1.66.0 --- .github/workflows/rust.yml | 4 ++-- src/core/Cargo.toml | 2 +- src/core/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b2fb07f08..459f29ece 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -273,11 +273,11 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: "1.65.0" + toolchain: "1.66.0" override: true - name: check if README matches MSRV defined here - run: grep '1.65.0' src/core/README.md + run: grep '1.66.0' src/core/README.md - name: Check if it builds properly uses: actions-rs/cargo@v1 diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 8b8bab2a1..bb309900c 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" readme = "README.md" autoexamples = false autobins = false -rust-version = "1.65.0" +rust-version = "1.66.0" [lib] name = "sourmash" diff --git a/src/core/README.md b/src/core/README.md index b71baaabc..0fa56ad29 100644 --- a/src/core/README.md +++ b/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.65.0. +Currently the minimum supported Rust version is 1.66.0.