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

ci(fuzz): Fix inaccuracies in cargo fuzz fmt

Browse source
This commit is contained in:
Chris Hennick 2024-06-08 13:26:45 -07:00
parent a0845c781d
commit 2333a847f7
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -45,10 +45,11 @@ impl <'k> Debug for FileOperation<'k> {
match &self.basic { match &self.basic {
BasicFileOperation::WriteNormalFile {contents, options} => { BasicFileOperation::WriteNormalFile {contents, options} => {
f.write_fmt(format_args!("let options = {:?};\n\ f.write_fmt(format_args!("let options = {:?};\n\
writer.start_file_from_path({:?}, options)?;\n\ writer.start_file_from_path({:?}, options)?;\n", options, self.path))?;
writer.write_all(&({:?}[..] as [u8]))?;\n\ for content_slice in contents {
drop(options);\n", f.write_fmt("writer.write_all(&({ : ? }[..] as [u8]))?;\n", content_slice)?;
options, self.path, contents)) }
f.write_str("drop(options);\n")
}, },
BasicFileOperation::WriteDirectory(options) => { BasicFileOperation::WriteDirectory(options) => {
f.write_fmt(format_args!("let options = {:?};\n\ f.write_fmt(format_args!("let options = {:?};\n\
@ -73,8 +74,7 @@ impl <'k> Debug for FileOperation<'k> {
{{\n\ {{\n\
{:?} {:?}
}}\n\ }}\n\
writer.shallow_copy_file_from_path(path, {:?})?;\n\ writer.deep_copy_file_from_path(path, {:?})?;\n", base.path, base, self.path))
drop(path);\n", base.path, base, self.path))
}, },
BasicFileOperation::MergeWithOtherFile {operations} => { BasicFileOperation::MergeWithOtherFile {operations} => {
f.write_str("let sub_writer = {\n\ f.write_str("let sub_writer = {\n\
@ -89,7 +89,7 @@ impl <'k> Debug for FileOperation<'k> {
}).collect::<Result<(), _>>()?; }).collect::<Result<(), _>>()?;
f.write_str("writer\n\ f.write_str("writer\n\
};\n\ };\n\
writer = sub_writer;\n") writer.merge_archive(sub_writer.finish_into_readable()?)?;\n")
}, },
}?; }?;
match &self.reopen { match &self.reopen {

13
src/types.rs
View file

@ -3,6 +3,7 @@ use crate::cp437::FromCp437;
use crate::write::{FileOptionExtension, FileOptions}; use crate::write::{FileOptionExtension, FileOptions};
use path::{Component, Path, PathBuf}; use path::{Component, Path, PathBuf};
use std::fmt; use std::fmt;
use std::fmt::{Debug, Formatter};
use std::mem; use std::mem;
use std::path; use std::path;
use std::sync::{Arc, OnceLock}; use std::sync::{Arc, OnceLock};
@ -77,7 +78,7 @@ impl From<System> for u8 {
/// ///
/// Modern zip files store more precise timestamps; see [`crate::extra_fields::ExtendedTimestamp`] /// Modern zip files store more precise timestamps; see [`crate::extra_fields::ExtendedTimestamp`]
/// for details. /// for details.
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] #[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct DateTime { pub struct DateTime {
year: u16, year: u16,
month: u8, month: u8,
@ -87,6 +88,16 @@ pub struct DateTime {
second: u8, second: u8,
} }
impl Debug for DateTime {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
if *self == Self::default() {
return f.write_str("DateTime::default()");
}
f.write_fmt(format_args!("DateTime::from_date_and_time({}, {}, {}, {}, {}, {})?",
self.year, self.month, self.day, self.hour, self.minute, self.second))
}
}
impl DateTime { impl DateTime {
/// Returns the current time if possible, otherwise the default of 1980-01-01. /// Returns the current time if possible, otherwise the default of 1980-01-01.
#[cfg(feature = "time")] #[cfg(feature = "time")]