Skip to content

test: Potential fixes for 3 code quality findings in benches/read-metadata.rs #610

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
Pr0methean merged 7 commits into from
Feb 3, 2026
Merged

test: Potential fixes for 3 code quality findings in benches/read-metadata.rs #610

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4740e06
Apply suggested fix to benches/read_metadata.rs from Copilot Autofix
Pr0methean Feb 2, 2026
e629840
Apply suggested fix to benches/read_metadata.rs from Copilot Autofix
Pr0methean Feb 2, 2026
275d10e
Apply suggested fix to benches/read_metadata.rs from Copilot Autofix
Pr0methean Feb 2, 2026
3f3a5ac
[skip ci] chore: run cargo fmt --all to apply standard formatting
amazon-q-developer[bot] Feb 2, 2026
7549bea
Merge branch 'master' into ai-findings-autofix/benches-read_metadata.rs
Pr0methean Feb 2, 2026
b547286
cargo fmt --all
Pr0methean Feb 2, 2026
569b7dc
Merge branch 'master' into ai-findings-autofix/benches-read_metadata.rs
Pr0methean Feb 2, 2026
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
15 changes: 7 additions & 8 deletions benches/read_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ fn generate_random_archive(count_files: usize, file_size: usize) -> ZipResult<Ve

let mut bytes = vec![0u8; file_size];

for i in 0..count_files {
let name = format!("file_deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef_{i}.dat");
for file_index in 0..count_files {
let name =
format!("file_deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef_{file_index}.dat");
writer.start_file(name, options)?;
getrandom::fill(&mut bytes)
.map_err(|e| std::io::Error::other(format!("getrandom error: {}", e)))?;
Expand Down Expand Up @@ -79,9 +80,7 @@ fn generate_zip64_archive_with_random_comment(comment_length: usize) -> ZipResul
let mut bytes = vec![0u8; comment_length];
getrandom::fill(&mut bytes)
.map_err(|e| std::io::Error::other(format!("getrandom error: {}", e)))?;
// should use the line below but still works
// writer.set_raw_zip64_comment(Some(comment));
writer.set_raw_comment(bytes.into_boxed_slice());
writer.set_raw_zip64_comment(Some(bytes.into_boxed_slice()));

writer.start_file("asdf.txt", options)?;
writer.write_all(b"asdf")?;
Expand All @@ -105,7 +104,7 @@ fn parse_stream_archive(bench: &mut Bencher) {

let bytes = generate_random_archive(STREAM_ZIP_ENTRIES, STREAM_FILE_SIZE).unwrap();

/* Write to a temporary file path to incur some filesystem overhead from repeated reads */
// Write to a temporary file path to incur some filesystem overhead from repeated reads
let dir = TempDir::with_prefix("stream-bench").unwrap();
let out = dir.path().join("bench-out.zip");
fs::write(&out, &bytes).unwrap();
Expand All @@ -121,13 +120,13 @@ fn parse_stream_archive(bench: &mut Bencher) {
}

fn parse_large_non_zip(bench: &mut Bencher) {
const FILE_SIZE: usize = 17_000_000;
const LARGE_FILE_SIZE: usize = 17_000_000;

// Create a large file that doesn't have a zip header (generating random data _might_ make a zip magic
// number somewhere which is _not_ what we're trying to test).
let dir = TempDir::with_prefix("large-non-zip-bench").unwrap();
let file = dir.path().join("zeros");
let buf = vec![0u8; FILE_SIZE];
let buf = vec![0u8; LARGE_FILE_SIZE];
fs::write(&file, &buf).unwrap();

bench.iter(|| {
Expand Down