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

Reformat and fix Clippy warning

Browse source
This commit is contained in:
Chris Hennick 2023-05-11 09:35:12 -07:00
parent 8c6816fb33
commit 2ad4c20681
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/read.rs
View file

@ -352,7 +352,9 @@ impl<R: Read + Seek> ZipArchive<R> {
"Invalid central directory size or offset", "Invalid central directory size or offset",
))?; ))?;
if directory_start > search_upper_bound { if directory_start > search_upper_bound {
return Err(ZipError::InvalidArchive("Invalid central directory size or offset")); return Err(ZipError::InvalidArchive(
"Invalid central directory size or offset",
));
} }
if footer64.disk_number != footer64.disk_with_central_directory { if footer64.disk_number != footer64.disk_with_central_directory {

4
src/spec.rs
View file

@ -61,9 +61,7 @@ impl CentralDirectoryEnd {
}) })
} }
pub fn find_and_parse<T: Read + Seek>( pub fn find_and_parse<T: Read + Seek>(reader: &mut T) -> ZipResult<(CentralDirectoryEnd, u64)> {
reader: &mut T,
) -> ZipResult<(CentralDirectoryEnd, u64)> {
const HEADER_SIZE: u64 = 22; const HEADER_SIZE: u64 = 22;
const BYTES_BETWEEN_MAGIC_AND_COMMENT_SIZE: u64 = HEADER_SIZE - 6; const BYTES_BETWEEN_MAGIC_AND_COMMENT_SIZE: u64 = HEADER_SIZE - 6;
let file_length = reader.seek(io::SeekFrom::End(0))?; let file_length = reader.seek(io::SeekFrom::End(0))?;

5
src/write.rs
View file

@ -1481,7 +1481,6 @@ mod test {
use crate::ZipArchive; use crate::ZipArchive;
use std::io; use std::io;
use std::io::{Read, Write}; use std::io::{Read, Write};
use zstd::zstd_safe::WriteBuf;
#[test] #[test]
fn write_empty_zip() { fn write_empty_zip() {
@ -1777,7 +1776,9 @@ mod test {
#[test] #[test]
fn test_filename_looks_like_zip64_locator_3() { fn test_filename_looks_like_zip64_locator_3() {
let mut writer = ZipWriter::new(io::Cursor::new(Vec::new())); let mut writer = ZipWriter::new(io::Cursor::new(Vec::new()));
writer.start_file("\0PK\u{6}\u{6}", FileOptions::default()).unwrap(); writer
.start_file("\0PK\u{6}\u{6}", FileOptions::default())
.unwrap();
writer writer
.start_file( .start_file(
"\0\u{4}\0\0PK\u{6}\u{7}\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\u{3}", "\0\u{4}\0\0PK\u{6}\u{7}\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\u{3}",