Skip to content

Commit 25251c9

Browse files
KerollmopsKerollmops
authored
Merge pull request #256 from RoaringBitmap/bump-rust-version-to-1.60.0
Bump Rust version to 1.65 and remove Bors
2 parents 516cd80 + 9f0d4d0 commit 25251c9

File tree

14 files changed

+45
-38
lines changed

14 files changed

+45
-38
lines changed

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- trying
66
pull_request:
77
branches:
8-
- master
8+
- main
99

1010
name: Continuous integration
1111

@@ -18,7 +18,7 @@ jobs:
1818
- stable
1919
- beta
2020
- nightly
21-
- 1.56.1
21+
- 1.65.0
2222
env:
2323
RUSTFLAGS: "-C target-cpu=native -C opt-level=3"
2424
ROARINGRS_BENCH_OFFLINE: "true"

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ serde = { version = "1.0.139", optional = true }
2525
simd = []
2626

2727
[dev-dependencies]
28-
proptest = "1.0.0"
28+
proptest = "1.2.0"
2929
serde_json = "1.0.85"
3030
bincode = "1.3.3"
3131

‎benchmarks/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ roaring = { path = ".." }
1111

1212
[dev-dependencies]
1313
once_cell = "1.9"
14-
git2 = { version = "0.13", default-features = false, features = ["https", "vendored-openssl"] }
14+
git2 = { version = "0.17", default-features = false, features = ["https", "vendored-openssl"] }
1515
zip = { version = "0.5", default-features = false, features = ["deflate"] }
1616
indicatif = "0.16"
1717
criterion = { version = "0.3", features = ["html_reports"] }

‎bors.toml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/bitmap/arbitrary.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ mod test {
173173
fn containers(n: usize)
174174
(keys in ArrayStore::sampled(..=n, ..=n),
175175
stores in vec(Store::arbitrary(), n)) -> RoaringBitmap {
176-
let containers = keys.into_iter().zip(stores.into_iter()).map(|(key, store)| {
176+
let containers = keys.into_iter().zip(stores).map(|(key, store)| {
177177
let mut container = Container { key, store };
178178
container.ensure_correct_store();
179179
container

‎src/bitmap/iter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl IntoIterator for RoaringBitmap {
133133

134134
impl<const N: usize> From<[u32; N]> for RoaringBitmap {
135135
fn from(arr: [u32; N]) -> Self {
136-
RoaringBitmap::from_iter(arr.into_iter())
136+
RoaringBitmap::from_iter(arr)
137137
}
138138
}
139139

‎src/bitmap/multiops.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fn try_multi_and_owned<E>(
125125
let mut start = start.into_iter();
126126

127127
if let Some(mut lhs) = start.next() {
128-
for rhs in start.into_iter().map(Ok).chain(iter) {
128+
for rhs in start.map(Ok).chain(iter) {
129129
if lhs.is_empty() {
130130
return Ok(lhs);
131131
}
@@ -151,7 +151,7 @@ fn try_multi_and_ref<'a, E>(
151151
let mut start = start.into_iter();
152152

153153
if let Some(mut lhs) = start.next().cloned() {
154-
for rhs in start.into_iter().map(Ok).chain(iter) {
154+
for rhs in start.map(Ok).chain(iter) {
155155
if lhs.is_empty() {
156156
return Ok(lhs);
157157
}
@@ -225,7 +225,7 @@ fn try_multi_or_owned<E>(
225225
return Ok(RoaringBitmap::new());
226226
};
227227

228-
for bitmap in start.into_iter().map(Ok).chain(iter) {
228+
for bitmap in start.map(Ok).chain(iter) {
229229
merge_container_owned(&mut containers, bitmap?.containers, BitOrAssign::bitor_assign);
230230
}
231231

@@ -323,7 +323,7 @@ fn try_multi_or_ref<'a, E: 'a>(
323323
};
324324

325325
// Phase 2: Operate on the remaining containers
326-
for bitmap in start.into_iter().map(Ok).chain(iter) {
326+
for bitmap in start.map(Ok).chain(iter) {
327327
merge_container_ref(&mut containers, &bitmap?.containers, |a, b| *a |= b);
328328
}
329329

‎src/bitmap/proptests.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ mod test {
399399
fn the_empty_set_is_the_identity_for_union(a in RoaringBitmap::arbitrary()) {
400400
prop_assert_eq!(&(&a | &empty_set()), &a);
401401

402+
#[allow(clippy::redundant_clone)]
402403
{ // op_assign_ref
403404
let mut x = a.clone();
404405
x |= &empty_set();
@@ -419,6 +420,7 @@ mod test {
419420
fn the_empty_set_is_the_identity_for_symmetric_difference(a in RoaringBitmap::arbitrary()) {
420421
prop_assert_eq!(&(&a ^ &empty_set()), &a);
421422

423+
#[allow(clippy::redundant_clone)]
422424
{ // op_assign_ref
423425
let mut x = a.clone();
424426
x ^= &empty_set();

‎src/bitmap/store/mod.rs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ impl BitOr<&Store> for &Store {
196196

197197
fn bitor(self, rhs: &Store) -> Store {
198198
match (self, rhs) {
199-
(&Array(ref vec1), &Array(ref vec2)) => Array(BitOr::bitor(vec1, vec2)),
199+
(Array(vec1), Array(vec2)) => Array(BitOr::bitor(vec1, vec2)),
200200
(&Bitmap(..), &Array(..)) => {
201201
let mut lhs = self.clone();
202202
BitOrAssign::bitor_assign(&mut lhs, rhs);
@@ -239,17 +239,17 @@ impl BitOrAssign<Store> for Store {
239239
impl BitOrAssign<&Store> for Store {
240240
fn bitor_assign(&mut self, rhs: &Store) {
241241
match (self, rhs) {
242-
(&mut Array(ref mut vec1), &Array(ref vec2)) => {
242+
(&mut Array(ref mut vec1), Array(vec2)) => {
243243
let this = mem::take(vec1);
244244
*vec1 = BitOr::bitor(&this, vec2);
245245
}
246-
(&mut Bitmap(ref mut bits1), &Array(ref vec2)) => {
246+
(&mut Bitmap(ref mut bits1), Array(vec2)) => {
247247
BitOrAssign::bitor_assign(bits1, vec2);
248248
}
249-
(&mut Bitmap(ref mut bits1), &Bitmap(ref bits2)) => {
249+
(&mut Bitmap(ref mut bits1), Bitmap(bits2)) => {
250250
BitOrAssign::bitor_assign(bits1, bits2);
251251
}
252-
(this @ &mut Array(..), &Bitmap(ref bits2)) => {
252+
(this @ &mut Array(..), Bitmap(bits2)) => {
253253
let mut lhs: Store = Bitmap(bits2.clone());
254254
BitOrAssign::bitor_assign(&mut lhs, &*this);
255255
*this = lhs;
@@ -263,7 +263,7 @@ impl BitAnd<&Store> for &Store {
263263

264264
fn bitand(self, rhs: &Store) -> Store {
265265
match (self, rhs) {
266-
(&Array(ref vec1), &Array(ref vec2)) => Array(BitAnd::bitand(vec1, vec2)),
266+
(Array(vec1), Array(vec2)) => Array(BitAnd::bitand(vec1, vec2)),
267267
(&Bitmap(..), &Array(..)) => {
268268
let mut rhs = rhs.clone();
269269
BitAndAssign::bitand_assign(&mut rhs, self);
@@ -306,7 +306,7 @@ impl BitAndAssign<&Store> for Store {
306306
#[allow(clippy::suspicious_op_assign_impl)]
307307
fn bitand_assign(&mut self, rhs: &Store) {
308308
match (self, rhs) {
309-
(&mut Array(ref mut vec1), &Array(ref vec2)) => {
309+
(&mut Array(ref mut vec1), Array(vec2)) => {
310310
let (mut lhs, rhs) = if vec2.len() < vec1.len() {
311311
(vec2.clone(), &*vec1)
312312
} else {
@@ -316,10 +316,10 @@ impl BitAndAssign<&Store> for Store {
316316
BitAndAssign::bitand_assign(&mut lhs, rhs);
317317
*vec1 = lhs;
318318
}
319-
(&mut Bitmap(ref mut bits1), &Bitmap(ref bits2)) => {
319+
(&mut Bitmap(ref mut bits1), Bitmap(bits2)) => {
320320
BitAndAssign::bitand_assign(bits1, bits2);
321321
}
322-
(&mut Array(ref mut vec1), &Bitmap(ref bits2)) => {
322+
(&mut Array(ref mut vec1), Bitmap(bits2)) => {
323323
BitAndAssign::bitand_assign(vec1, bits2);
324324
}
325325
(this @ &mut Bitmap(..), &Array(..)) => {
@@ -336,7 +336,7 @@ impl Sub<&Store> for &Store {
336336

337337
fn sub(self, rhs: &Store) -> Store {
338338
match (self, rhs) {
339-
(&Array(ref vec1), &Array(ref vec2)) => Array(Sub::sub(vec1, vec2)),
339+
(Array(vec1), Array(vec2)) => Array(Sub::sub(vec1, vec2)),
340340
_ => {
341341
let mut lhs = self.clone();
342342
SubAssign::sub_assign(&mut lhs, rhs);
@@ -349,16 +349,16 @@ impl Sub<&Store> for &Store {
349349
impl SubAssign<&Store> for Store {
350350
fn sub_assign(&mut self, rhs: &Store) {
351351
match (self, rhs) {
352-
(&mut Array(ref mut vec1), &Array(ref vec2)) => {
352+
(&mut Array(ref mut vec1), Array(vec2)) => {
353353
SubAssign::sub_assign(vec1, vec2);
354354
}
355-
(&mut Bitmap(ref mut bits1), &Array(ref vec2)) => {
355+
(&mut Bitmap(ref mut bits1), Array(vec2)) => {
356356
SubAssign::sub_assign(bits1, vec2);
357357
}
358-
(&mut Bitmap(ref mut bits1), &Bitmap(ref bits2)) => {
358+
(&mut Bitmap(ref mut bits1), Bitmap(bits2)) => {
359359
SubAssign::sub_assign(bits1, bits2);
360360
}
361-
(&mut Array(ref mut vec1), &Bitmap(ref bits2)) => {
361+
(&mut Array(ref mut vec1), Bitmap(bits2)) => {
362362
SubAssign::sub_assign(vec1, bits2);
363363
}
364364
}
@@ -370,7 +370,7 @@ impl BitXor<&Store> for &Store {
370370

371371
fn bitxor(self, rhs: &Store) -> Store {
372372
match (self, rhs) {
373-
(&Array(ref vec1), &Array(ref vec2)) => Array(BitXor::bitxor(vec1, vec2)),
373+
(Array(vec1), Array(vec2)) => Array(BitXor::bitxor(vec1, vec2)),
374374
(&Array(..), &Bitmap(..)) => {
375375
let mut lhs = rhs.clone();
376376
BitXorAssign::bitxor_assign(&mut lhs, self);
@@ -408,17 +408,17 @@ impl BitXorAssign<Store> for Store {
408408
impl BitXorAssign<&Store> for Store {
409409
fn bitxor_assign(&mut self, rhs: &Store) {
410410
match (self, rhs) {
411-
(&mut Array(ref mut vec1), &Array(ref vec2)) => {
411+
(&mut Array(ref mut vec1), Array(vec2)) => {
412412
let this = mem::take(vec1);
413413
*vec1 = BitXor::bitxor(&this, vec2);
414414
}
415-
(&mut Bitmap(ref mut bits1), &Array(ref vec2)) => {
415+
(&mut Bitmap(ref mut bits1), Array(vec2)) => {
416416
BitXorAssign::bitxor_assign(bits1, vec2);
417417
}
418-
(&mut Bitmap(ref mut bits1), &Bitmap(ref bits2)) => {
418+
(&mut Bitmap(ref mut bits1), Bitmap(bits2)) => {
419419
BitXorAssign::bitxor_assign(bits1, bits2);
420420
}
421-
(this @ &mut Array(..), &Bitmap(ref bits2)) => {
421+
(this @ &mut Array(..), Bitmap(bits2)) => {
422422
let mut lhs: Store = Bitmap(bits2.clone());
423423
BitXorAssign::bitxor_assign(&mut lhs, &*this);
424424
*this = lhs;

‎src/treemap/iter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl IntoIterator for RoaringTreemap {
232232

233233
impl<const N: usize> From<[u64; N]> for RoaringTreemap {
234234
fn from(arr: [u64; N]) -> Self {
235-
RoaringTreemap::from_iter(arr.into_iter())
235+
RoaringTreemap::from_iter(arr)
236236
}
237237
}
238238

0 commit comments

Comments
 (0)