Skip to content

Commit 4ad6db9

Browse files
authored
Merge pull request #91 from saulius/bugfix/ci_fixes
LLVM does not seem to be installed by default anymore
2 parents 8def202 + 7a72eee commit 4ad6db9

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

.github/workflows/rust.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ jobs:
4545
run: echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV
4646
shell: bash
4747

48-
# This confuses Rust's bindgen
49-
# See https://github.com/rust-lang/rust-bindgen/issues/1506
50-
- name: Uninstall LLVM from Homebrew
51-
if: matrix.os == 'macos-latest'
52-
run: brew uninstall llvm
53-
5448
- name: Build
5549
run: cargo +${{ matrix.rust }} build
5650

croaring/benches/performance_comparison.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ fn perf_comp_and_inplace_rust_roaring(b: &mut Bencher) {
209209
let bitmap2: RoaringBitmap = (100..200).collect();
210210

211211
b.iter(|| {
212-
bitmap1.intersect_with(black_box(&bitmap2));
212+
bitmap1 &= black_box(&bitmap2);
213213
});
214214
}
215215

@@ -247,7 +247,7 @@ fn perf_comp_or_inplace_rust_roaring(b: &mut Bencher) {
247247
let bitmap2: RoaringBitmap = (100..200).collect();
248248

249249
b.iter(|| {
250-
bitmap1.union_with(black_box(&bitmap2));
250+
bitmap1 |= &bitmap2;
251251
});
252252
}
253253

@@ -285,7 +285,7 @@ fn perf_comp_xor_inplace_rust_roaring(b: &mut Bencher) {
285285
let bitmap2: RoaringBitmap = (100..200).collect();
286286

287287
b.iter(|| {
288-
bitmap1.symmetric_difference_with(black_box(&bitmap2));
288+
bitmap1 ^= black_box(&bitmap2);
289289
});
290290
}
291291

0 commit comments

Comments
 (0)