DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor FileOptions generation using arbitrary_loop

Browse source
This commit is contained in:
Chris Hennick 2023-05-13 14:40:23 -07:00
parent a2ed77abd3
commit ba4d6548ed
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/write.rs
View file

@ -152,18 +152,16 @@ impl arbitrary::Arbitrary<'_> for FileOptions {
central_extra_data: Vec::with_capacity(u16::MAX as usize), central_extra_data: Vec::with_capacity(u16::MAX as usize),
alignment: u8::arbitrary(u)? as u16 + 1, alignment: u8::arbitrary(u)? as u16 + 1,
}; };
#[derive(arbitrary::Arbitrary)] u.arbitrary_loop(None, Some(16383), || {
struct ExtraDataField {
header_id: u16,
data: Vec<u8>,
central_only: bool,
}
let extra_data = Vec::<ExtraDataField>::arbitrary(u)?;
for field in extra_data {
options options
.add_extra_data(field.header_id, field.data.as_slice(), field.central_only) .add_extra_data(
u16::arbitrary(u)?,
Vec::<u8>::arbitrary(u)?,
bool::arbitrary(u)?,
)
.map_err(|_| arbitrary::Error::IncorrectFormat)?; .map_err(|_| arbitrary::Error::IncorrectFormat)?;
} Ok(core::ops::ControlFlow::Continue(()))
});
Ok(options) Ok(options)
} }
} }