From 3622e8f68243706091ecb7e42cf2d554985b95d9 Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Mon, 12 Sep 2022 10:26:39 -0400 Subject: [PATCH 1/4] hopefully a depend fix --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f87f023b..439dca88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ hmac = { version = "0.12.1", optional = true, features = ["reset"] } pbkdf2 = {version = "0.11.0", optional = true } sha1 = {version = "0.10.1", optional = true } time = { version = "0.3.7", features = ["formatting", "macros" ], optional = true } -zstd = { version = "0.11.0", optional = true } +zstd = { version = "0.11", optional = true } [target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies] crossbeam-utils = "0.8.8" From 13084ef73276adc49bc5f8d3f50608aaa633604f Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Mon, 12 Sep 2022 18:53:15 -0400 Subject: [PATCH 2/4] Make github ci use 1.59 for time depend and fix two clippy warnings --- .github/workflows/ci.yaml | 2 +- src/types.rs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 83004438..35d4a6e9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - rust: [stable, 1.57.0] + rust: [stable, 1.59.0] steps: - uses: actions/checkout@master diff --git a/src/types.rs b/src/types.rs index b65fad40..9b3b00c4 100644 --- a/src/types.rs +++ b/src/types.rs @@ -44,7 +44,7 @@ mod atomic { #[cfg(feature = "time")] use time::{error::ComponentRange, Date, Month, OffsetDateTime, PrimitiveDateTime, Time}; -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum System { Dos = 0, Unix = 3, @@ -143,10 +143,8 @@ impl DateTime { second: u8, ) -> Result { if (1980..=2107).contains(&year) - && month >= 1 - && month <= 12 - && day >= 1 - && day <= 31 + && (1..=12).contains(&month) + && (1..=31).contains(&day) && hour <= 23 && minute <= 59 && second <= 60 From 89e84e1032ebcf12ad849ad34ae7aa9fe700f940 Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Tue, 27 Sep 2022 13:30:55 -0400 Subject: [PATCH 3/4] Fixed new Clippy Warnings --- src/read.rs | 8 ++++---- src/write.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/read.rs b/src/read.rs index 728ddf57..32403fa0 100644 --- a/src/read.rs +++ b/src/read.rs @@ -461,7 +461,7 @@ impl ZipArchive { } else { if let Some(p) = outpath.parent() { if !p.exists() { - fs::create_dir_all(&p)?; + fs::create_dir_all(p)?; } } let mut outfile = fs::File::create(&outpath)?; @@ -681,11 +681,11 @@ pub(crate) fn central_header_to_zip_file( reader.read_exact(&mut file_comment_raw)?; let file_name = match is_utf8 { - true => String::from_utf8_lossy(&*file_name_raw).into_owned(), + true => String::from_utf8_lossy(&file_name_raw).into_owned(), false => file_name_raw.clone().from_cp437(), }; let file_comment = match is_utf8 { - true => String::from_utf8_lossy(&*file_comment_raw).into_owned(), + true => String::from_utf8_lossy(&file_comment_raw).into_owned(), false => file_comment_raw.from_cp437(), }; @@ -1085,7 +1085,7 @@ pub fn read_zipfile_from_stream<'a, R: io::Read>( reader.read_exact(&mut extra_field)?; let file_name = match is_utf8 { - true => String::from_utf8_lossy(&*file_name_raw).into_owned(), + true => String::from_utf8_lossy(&file_name_raw).into_owned(), false => file_name_raw.clone().from_cp437(), }; diff --git a/src/write.rs b/src/write.rs index 61ce378c..e43cc85f 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1301,7 +1301,7 @@ fn path_to_string(path: &std::path::Path) -> String { if !path_str.is_empty() { path_str.push('/'); } - path_str.push_str(&*os_str.to_string_lossy()); + path_str.push_str(&os_str.to_string_lossy()); } } path_str From e2ff935aaf9501ed01f8b88c36b95755149ffebe Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Fri, 7 Oct 2022 13:20:50 -0400 Subject: [PATCH 4/4] Fixed new Clippy Warnings --- Cargo.toml | 2 +- examples/extract_lorem.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 439dca88..05b3f967 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ hmac = { version = "0.12.1", optional = true, features = ["reset"] } pbkdf2 = {version = "0.11.0", optional = true } sha1 = {version = "0.10.1", optional = true } time = { version = "0.3.7", features = ["formatting", "macros" ], optional = true } -zstd = { version = "0.11", optional = true } +zstd = { version = "0.11.2", optional = true } [target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies] crossbeam-utils = "0.8.8" diff --git a/examples/extract_lorem.rs b/examples/extract_lorem.rs index a34a04f4..4b3773a0 100644 --- a/examples/extract_lorem.rs +++ b/examples/extract_lorem.rs @@ -11,7 +11,7 @@ fn real_main() -> i32 { return 1; } let fname = std::path::Path::new(&*args[1]); - let zipfile = std::fs::File::open(&fname).unwrap(); + let zipfile = std::fs::File::open(fname).unwrap(); let mut archive = zip::ZipArchive::new(zipfile).unwrap();