diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7b959b..bcb8836 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,25 @@ jobs: - name: Rust Test run: cargo test --workspace --all-features + msrv: + name: MSRV + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + + - name: Read MSRV + id: msrv + shell: bash + run: echo "version=$(grep '^rust-version' Cargo.toml | awk -F'\"' '{print $2}')" >> $GITHUB_OUTPUT + + - name: Rust Toolchain + uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + with: + toolchain: "${{ steps.msrv.outputs.version }}" + + - name: Rust Check + run: cargo +${{ steps.msrv.outputs.version }} check --lib --all-features + bench-codspeed: name: Benchmark with Codspeed runs-on: diff --git a/Cargo.toml b/Cargo.toml index 621a6da..0a35768 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/spiraldb/onpair" readme = "README.md" keywords = ["compression", "strings", "onpair", "random-access", "lightweight"] categories = ["compression"] -rust-version = "1.91.0" +rust-version = "1.95.0" edition = "2024" exclude = [".github/*"] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index dbcc5a2..c3579bf 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.91.0" +channel = "1.100.0" components = ["rust-src", "rustfmt", "clippy", "rust-analyzer"] profile = "minimal" diff --git a/src/encoding/dictionary_matcher.rs b/src/encoding/dictionary_matcher.rs index 3ef9e02..6ba7b09 100644 --- a/src/encoding/dictionary_matcher.rs +++ b/src/encoding/dictionary_matcher.rs @@ -210,7 +210,9 @@ impl DictionaryMatcher { chains.resize(keys.len(), PrefixChain::new(dict, &chain, &mut prefix_pool)); let blocks: Vec = keys - .chunks_exact(BLOCK_KEYS) + .as_chunks::() + .0 + .iter() .map(|chunk| KeyBlock { hi: std::array::from_fn(|i| (chunk[i] >> 64) as u64), lo: std::array::from_fn(|i| chunk[i] as u64), diff --git a/src/search/substring/probe/scan/matcher/table.rs b/src/search/substring/probe/scan/matcher/table.rs index 341d5c5..cfb26b7 100644 --- a/src/search/substring/probe/scan/matcher/table.rs +++ b/src/search/substring/probe/scan/matcher/table.rs @@ -31,10 +31,10 @@ impl Matcher for Table { /// Always packs: a lookup per code leaves nothing to skip. fn check(&self, codes: &Block, bits: &mut Mask, _skip_empty: bool) -> bool { let mut any = 0; - for (word, codes) in bits.iter_mut().zip(codes.chunks_exact(64)) { + for (word, codes) in bits.iter_mut().zip(codes.as_chunks::<64>().0) { // Eight independent shift-OR chains per word. let mut packed = 0u64; - for (group, codes) in codes.chunks_exact(8).enumerate() { + for (group, codes) in codes.as_chunks::<8>().0.iter().enumerate() { let mut byte = 0u64; for (bit, &code) in codes.iter().enumerate() { byte |= u64::from(self.admits[usize::from(code)]) << bit; diff --git a/src/search/substring/probe/scan/resolver.rs b/src/search/substring/probe/scan/resolver.rs index 9ade3fc..f3e8fc7 100644 --- a/src/search/substring/probe/scan/resolver.rs +++ b/src/search/substring/probe/scan/resolver.rs @@ -134,7 +134,7 @@ mod tests { //! hit density and row length, including empty rows, long gaps, and rows that //! span blocks. These tests accept every hit to isolate row resolution. - use super::{Mask, Resolver, find_row}; + use super::{Resolver, find_row}; use crate::core::dictionary::Dictionary; use crate::core::offset::Offset; use crate::core::types::Token; @@ -161,8 +161,8 @@ mod tests { }; let mut out = Vec::new(); let mut resolver = Resolver::new(input); - for (block, bits) in mask.chunks_exact(BLOCK / 64).enumerate() { - let bits: &Mask = bits.try_into().unwrap(); + let (blocks, _) = mask.as_chunks::<{ BLOCK / 64 }>(); + for (block, bits) in blocks.iter().enumerate() { if bits.iter().any(|&set| set != 0) { resolver.rows(bits, block * BLOCK, &mut out); }