From 0ee34bd105eac80de1bcf96a0b2b82b5f25c578c Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 25 Oct 2021 08:16:54 -0700 Subject: [PATCH] Bump MSRV to 1.52.0 and fix cargo fmt and doc --- .github/workflows/ci.yaml | 2 +- README.md | 2 +- src/compression.rs | 2 +- src/types.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 83741894..0e4ba0a4 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.36.0] + rust: [stable, 1.52.0] steps: - uses: actions/checkout@master diff --git a/README.md b/README.md index e489b98d..e7e08e6c 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ All of these are enabled by default. MSRV ---- -Our current Minimum Supported Rust Version is **1.36.0**. When adding features, +Our current Minimum Supported Rust Version is **1.52.0**. When adding features, we will follow these guidelines: - We will always support the latest four minor Rust versions. This gives you a 6 diff --git a/src/compression.rs b/src/compression.rs index 5fdde070..c1cf44db 100644 --- a/src/compression.rs +++ b/src/compression.rs @@ -9,7 +9,7 @@ use std::fmt; /// contents to be read without context. /// /// When creating ZIP files, you may choose the method to use with -/// [`zip::write::FileOptions::compression_method`] +/// [`crate::write::FileOptions::compression_method`] #[derive(Copy, Clone, PartialEq, Eq, Debug)] pub enum CompressionMethod { /// Store the file as is diff --git a/src/types.rs b/src/types.rs index 6f3b2b8b..f99bc06b 100644 --- a/src/types.rs +++ b/src/types.rs @@ -152,7 +152,7 @@ impl DateTime { /// Converts the DateTime to a OffsetDateTime structure pub fn to_time(&self) -> Result { use std::convert::TryFrom; - + let date = Date::from_calendar_date(self.year as i32, Month::try_from(self.month)?, self.day)?; let time = Time::from_hms(self.hour, self.minute, self.second)?;