Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Rust 1.70 #20

Merged
merged 4 commits into from
Oct 5, 2023
Merged

Fix for Rust 1.70 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a53e140
Fix for Rust 1.70
Keats Jun 14, 2023
adace7d
Clippy suggestions
Keats Jun 14, 2023
0a66ad6
Add regression test for #20 (rust-lang/rust#98112)
boydgreenfield Oct 5, 2023
5400455
Update pinned rustc version in GHA to 1.69
boydgreenfield Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
include:
- build: pinned
os: ubuntu-22.04
rust: 1.60.0
rust: 1.69.0
- build: stable
os: ubuntu-22.04
rust: stable
Expand Down
34 changes: 17 additions & 17 deletions src/mmap_bitvec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ impl MmapBitVec {
io::ErrorKind::InvalidData,
format!(
"file should be {} bytes (with {} header), but file is {} bytes",
byte_size + total_header_size as u64,
byte_size + total_header_size,
total_header_size,
file.metadata()?.len(),
),
Expand Down Expand Up @@ -282,9 +282,9 @@ impl MmapBitVec {
if r.end > self.size {
panic!("Range ends outside of BitVec")
}
let byte_idx_st = (r.start >> 3) as usize;
let byte_idx_en = ((r.end - 1) >> 3) as usize;
let new_size: usize = (((r.end - r.start) as usize - 1) >> 3) + 1;
let byte_idx_st = r.start >> 3;
let byte_idx_en = (r.end - 1) >> 3;
let new_size: usize = (((r.end - r.start) - 1) >> 3) + 1;

let ptr: *const u8 = self.mmap.as_ptr();
let mut v = vec![0; new_size];
Expand Down Expand Up @@ -333,7 +333,7 @@ impl MmapBitVec {
} else {
0
};
let byte_idx_en = ((r.end - 1) >> 3) as usize;
let byte_idx_en = (r.end - 1) >> 3;

let mmap: *mut u8 = self
.mmap
Expand Down Expand Up @@ -406,8 +406,8 @@ impl BitVector for MmapBitVec {

/// Return the number of set bits in the range `r`
fn rank(&self, r: Range<usize>) -> usize {
let byte_idx_st = (r.start >> 3) as usize;
let byte_idx_en = ((r.end - 1) >> 3) as usize;
let byte_idx_st = r.start >> 3;
let byte_idx_en = (r.end - 1) >> 3;
let mmap: *const u8 = self.mmap.as_ptr();

let mut bit_count = 0usize;
Expand Down Expand Up @@ -452,7 +452,7 @@ impl BitVector for MmapBitVec {

/// Return the position of the `nth` set bit with `start` treated as the 0th position, or `None` if there is no set bit
fn select(&self, n: usize, start: usize) -> Option<usize> {
let byte_idx_st = (start >> 3) as usize;
let byte_idx_st = start >> 3;
let size_front = 8u8 - (start & 7) as u8;
let mmap: *const u8 = self.mmap.as_ptr();

Expand Down Expand Up @@ -494,8 +494,8 @@ impl BitVector for MmapBitVec {
} else if r.end > self.size {
panic!("Range ends outside of BitVec")
}
let byte_idx_st = (r.start >> 3) as usize;
let byte_idx_en = ((r.end - 1) >> 3) as usize;
let byte_idx_st = r.start >> 3;
let byte_idx_en = (r.end - 1) >> 3;
let new_size: u8 = (r.end - r.start) as u8;

let mut v;
Expand All @@ -513,7 +513,7 @@ impl BitVector for MmapBitVec {
// we have to transmute since we don't know if it's a u64 or u128
#[allow(clippy::transmute_ptr_to_ptr)]
let lg_ptr: *const u128 = transmute(ptr.add(byte_idx_st));
v |= (*lg_ptr).to_be() << (r.start & 7) >> (128 - new_size);
v |= lg_ptr.read_unaligned().to_be() << (r.start & 7) >> (128 - new_size);
}
} else {
// special case if we can't get a whole u64 out without running outside the buffer
Expand All @@ -526,7 +526,7 @@ impl BitVector for MmapBitVec {
}

// mask out the high bits in case we copied extra
v & (u128::max_value() >> (128 - new_size))
v & (u128::MAX >> (128 - new_size))
}

/// Set an unaligned range of bits using a `u64`.
Expand All @@ -542,8 +542,8 @@ impl BitVector for MmapBitVec {
if r.end > self.size {
panic!("Range ends outside of BitVec")
}
let byte_idx_st = (r.start >> 3) as usize;
let byte_idx_en = ((r.end - 1) >> 3) as usize;
let byte_idx_st = r.start >> 3;
let byte_idx_en = (r.end - 1) >> 3;
let new_size: u8 = (r.end - r.start) as u8;

// split off the front byte
Expand Down Expand Up @@ -602,8 +602,8 @@ impl BitVector for MmapBitVec {
if (r.end - 1) > self.size {
panic!("Range ends outside of BitVec")
}
let byte_idx_st = (r.start >> 3) as usize;
let byte_idx_en = ((r.end - 1) >> 3) as usize;
let byte_idx_st = r.start >> 3;
let byte_idx_en = (r.end - 1) >> 3;

let mmap: *mut u8 = self
.mmap
Expand Down Expand Up @@ -701,7 +701,7 @@ mod test {

#[test]
fn test_bitvec_get_range() {
let mut b = MmapBitVec::from_memory(128).unwrap();
let mut b = MmapBitVec::from_memory(1024).unwrap();
b.set(2, true);
b.set(3, true);
b.set(5, true);
Expand Down