diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ac85953..3c55e902 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: - nightly # When changing this value don't forget to change the `package.rust-version` field in # `roaring/Cargo.toml`!!! - - 1.80.1 + - 1.82.0 env: RUSTFLAGS: "-C target-cpu=native -C opt-level=3" @@ -64,7 +64,7 @@ jobs: - stable - beta - nightly - - 1.80.1 + - 1.82.0 features: - default - no-std @@ -98,7 +98,7 @@ jobs: run: cargo test -p roaring --features serde - name: Test Benches - if: matrix.rust != '1.80.1' && matrix.features == 'default' + if: matrix.rust != '1.82.0' && matrix.features == 'default' run: cargo test -p benchmarks --benches - name: Test no default features diff --git a/roaring/Cargo.toml b/roaring/Cargo.toml index 25557999..483864fb 100644 --- a/roaring/Cargo.toml +++ b/roaring/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "roaring" -version = "0.11.2" +version = "0.11.3" # When changing this value don't forget to change the MSRV test in `.github/workflows/test.yml`!! -rust-version = "1.80.1" +rust-version = "1.82.0" authors = ["Wim Looman ", "Kerollmops "] description = "A better compressed bitset - pure Rust implementation" diff --git a/roaring/src/bitmap/store/array_store/mod.rs b/roaring/src/bitmap/store/array_store/mod.rs index 173b7def..61967704 100644 --- a/roaring/src/bitmap/store/array_store/mod.rs +++ b/roaring/src/bitmap/store/array_store/mod.rs @@ -150,7 +150,7 @@ impl ArrayStore { } pub fn push(&mut self, index: u16) -> bool { - if self.max().map_or(true, |max| max < index) { + if self.max().is_none_or(|max| max < index) { self.vec.push(index); true } else { @@ -493,7 +493,7 @@ impl SubAssign<&Self> for ArrayStore { let mut i = 0; self.retain(|x| { i += rhs.iter().skip(i).position(|y| *y >= x).unwrap_or(rhs.vec.len()); - rhs.vec.get(i).map_or(true, |y| x != *y) + rhs.vec.get(i).is_none_or(|y| x != *y) }); } } diff --git a/roaring/src/bitmap/store/bitmap_store.rs b/roaring/src/bitmap/store/bitmap_store.rs index 98eed58f..ca32e2b5 100644 --- a/roaring/src/bitmap/store/bitmap_store.rs +++ b/roaring/src/bitmap/store/bitmap_store.rs @@ -155,7 +155,7 @@ impl BitmapStore { } pub fn push(&mut self, index: u16) -> bool { - if self.max().map_or(true, |max| max < index) { + if self.max().is_none_or(|max| max < index) { self.insert(index); true } else {