Skip to content

Commit

Permalink
yikes, MSRV to 1.74...
Browse files Browse the repository at this point in the history
  • Loading branch information
luizirber committed Mar 23, 2024
1 parent 87c3913 commit 34317c7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: "1.67.0"
toolchain: "1.74.0"
override: true

- name: check if README matches MSRV defined here
run: grep '1.67.0' src/core/README.md
run: grep '1.74.0' src/core/README.md

- name: Check if it builds properly
uses: actions-rs/cargo@v1
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
readme = "README.md"
autoexamples = false
autobins = false
rust-version = "1.67.0"
rust-version = "1.74.0"

[lib]
name = "sourmash"
Expand Down Expand Up @@ -50,8 +50,6 @@ once_cell = "1.18.0"
ouroboros = "0.18.3"
primal-check = "0.3.1"
rayon = { version = "1.9.0", optional = true }
rc-zip = { version = "4.0.0", default-features = false }
rc-zip-sync = "4.0.0"
rkyv = { version = "0.7.44", optional = true }
roaring = "0.10.3"
roots = "0.0.8"
Expand Down Expand Up @@ -114,3 +112,5 @@ 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 }
rc-zip = { version = "4.0.0", default-features = false }
rc-zip-sync = "4.0.0"
2 changes: 1 addition & 1 deletion src/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Development happens on github at

## Minimum supported Rust version

Currently the minimum supported Rust version is 1.67.0.
Currently the minimum supported Rust version is 1.74.0.
7 changes: 4 additions & 3 deletions src/core/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,14 @@ pub enum SourmashError {
#[error(transparent)]
CsvError(#[from] csv::Error),

#[error(transparent)]
ZipError(#[from] rc_zip::error::Error),

#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
#[error(transparent)]
Panic(#[from] crate::ffi::utils::Panic),

#[cfg(not(target_arch = "wasm32"))]
#[error(transparent)]
ZipError(#[from] rc_zip::error::Error),

#[cfg(not(target_arch = "wasm32"))]
#[cfg(feature = "branchwater")]
#[error(transparent)]
Expand Down

0 comments on commit 34317c7

Please sign in to comment.