Skip to content

Update bitvec to 1.0.1 #25

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

Merged
merged 2 commits into from
Dec 1, 2022
Merged

Update bitvec to 1.0.1 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86d3d0d
Update bitvec to 1.0.1
cecton Nov 16, 2022
7856586
Bump MSRV to 1.56
cecton Nov 16, 2022
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/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- macos-latest
rust:
- stable
- 1.51.0 # MSRV
- 1.56.0 # MSRV
include:
- os: ubuntu-latest
rust: stable
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include = ["src/**/*.rs", "tests/fixtures/*.img", "README.md", "LICENSE.Apache-2
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bitvec = "0.22"
bitvec = "1.0.1"
bincode = "1.0.1"
serde = { version = "1.0.116", features = ["derive"] }
serde-big-array = "0.4.1"
Expand Down
16 changes: 8 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,15 +1454,15 @@ impl<'de> Visitor<'de> for CHSVisitor {
where
A: SeqAccess<'de>,
{
let head = BitVec::<Msb0, u8>::from_vec(vec![seq.next_element::<u8>()?.unwrap()]);
let mut bv = BitVec::<Msb0, u8>::from_vec(vec![seq.next_element::<u8>()?.unwrap()]);
let mut cylinder = BitVec::<Msb0, u16>::with_capacity(10);
let head = BitVec::<u8, Msb0>::from_vec(vec![seq.next_element::<u8>()?.unwrap()]);
let mut bv = BitVec::<u8, Msb0>::from_vec(vec![seq.next_element::<u8>()?.unwrap()]);
let mut cylinder = BitVec::<u16, Msb0>::with_capacity(10);
cylinder.extend(repeat(false).take(6));
cylinder.extend(bv.drain(..2));
cylinder.extend(BitVec::<Msb0, u8>::from_vec(vec![seq
cylinder.extend(BitVec::<u8, Msb0>::from_vec(vec![seq
.next_element::<u8>()?
.unwrap()]));
let mut sector = BitVec::<Msb0, u8>::with_capacity(8);
let mut sector = BitVec::<u8, Msb0>::with_capacity(8);
sector.push(false);
sector.push(false);
sector.extend(bv.drain(..));
Expand All @@ -1489,9 +1489,9 @@ impl Serialize for CHS {
where
S: Serializer,
{
let mut bv = BitVec::<Msb0, u8>::from_vec(vec![self.head]);
let mut sector = BitVec::<Msb0, u8>::from_vec(vec![self.sector]);
let mut cylinder = BitVec::<Msb0, u16>::from_vec(vec![self.cylinder]);
let mut bv = BitVec::<u8, Msb0>::from_vec(vec![self.head]);
let mut sector = BitVec::<u8, Msb0>::from_vec(vec![self.sector]);
let mut cylinder = BitVec::<u16, Msb0>::from_vec(vec![self.cylinder]);
bv.extend(cylinder.drain(..8).skip(6));
bv.extend(sector.drain(2..));
bv.extend(cylinder.drain(..));
Expand Down