Rust 2021 edition + unpin zeroize; MSRV 1.56 (#147)

daxpedda · web-flow · commit 890e5abf08a1 · 2022-02-14T15:55:11.000-07:00
- Bumps all crates to 2021 edition
- Removes `zeroize` pinning to preserve MSRV
- New MSRV is 1.56
diff --git a/.github/workflows/ghash.yml b/.github/workflows/ghash.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.49.0 # MSRV
+          - 1.56.1 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.49.0 # MSRV
+          - 1.56.1 # MSRV
           - stable
     steps:
     - uses: actions/checkout@v1
diff --git a/.github/workflows/poly1305.yml b/.github/workflows/poly1305.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.49.0 # MSRV
+          - 1.56.1 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -50,15 +50,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -86,15 +86,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -121,15 +121,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -154,13 +154,13 @@ jobs:
         include:
           # ARM64
           - target: aarch64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: aarch64-unknown-linux-gnu
             rust: stable
 
           # PPC32
           - target: powerpc-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: powerpc-unknown-linux-gnu
             rust: stable
 
diff --git a/.github/workflows/polyval.yml b/.github/workflows/polyval.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.49.0 # MSRV
+          - 1.56.1 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -51,15 +51,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -87,15 +87,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -122,15 +122,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -155,13 +155,13 @@ jobs:
         include:
           # ARM64
           - target: aarch64-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: aarch64-unknown-linux-gnu
             rust: stable
 
           # PPC32
           - target: powerpc-unknown-linux-gnu
-            rust: 1.49.0 # MSRV
+            rust: 1.56.1 # MSRV
           - target: powerpc-unknown-linux-gnu
             rust: stable
 
diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
@@ -21,7 +21,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.49.0
+        toolchain: 1.56.1
         components: clippy
     - run: cargo clippy --all --all-features -- -D warnings
 
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,3 +4,4 @@ members = [
     "poly1305",
     "polyval"
 ]
+resolver = "2"
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Collection of [Universal Hash Functions][1] written in pure Rust.
 
 ### Minimum Supported Rust Version
 
-All crates in this repository support **Rust 1.49** or higher.
+All crates in this repository support **Rust 1.56** or higher.
 
 In the future, we reserve the right to change the Minimum Supported Rust
 Version, but it will be done with the minor version bump.
@@ -39,7 +39,7 @@ dual licensed as above, without any additional terms or conditions.
 
 [//]: # (badges)
 
-[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
 [deps-image]: https://deps.rs/repo/github/RustCrypto/universal-hashes/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/universal-hashes
 
diff --git a/ghash/CHANGELOG.md b/ghash/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Changed
+- Relax `zeroize` constraints ([#147])
+- Upgrade to Rust 2021 edition ([#147])
+
+[#147]: https://github.com/RustCrypto/universal-hashes/pull/147
+
 ## 0.4.4 (2021-08-27)
 ### Changed
 - Relax `zeroize` constraints ([#141])
diff --git a/ghash/Cargo.toml b/ghash/Cargo.toml
@@ -12,14 +12,15 @@ repository = "https://github.com/RustCrypto/universal-hashes"
 readme = "README.md"
 keywords = ["aes-gcm", "crypto", "universal-hashing"]
 categories = ["cryptography", "no-std"]
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"
 
 [dependencies]
 opaque-debug = "0.3"
 polyval = { version = "0.5.1", path = "../polyval" }
 
 # optional dependencies
-zeroize = { version = ">=1, <1.4", optional = true, default-features = false }
+zeroize = { version = "1", optional = true, default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3"
diff --git a/ghash/README.md b/ghash/README.md
@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/ghash/badge.svg
 [docs-link]: https://docs.rs/ghash/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
 [build-image]: https://github.com/RustCrypto/universal-hashes/workflows/ghash/badge.svg?branch=master&event=push
 [build-link]: https://github.com/RustCrypto/universal-hashes/actions?query=workflow%3Aghash
 
diff --git a/poly1305/CHANGELOG.md b/poly1305/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Changed
+- Relax `zeroize` constraints ([#147])
+- Upgrade to Rust 2021 edition ([#147])
+
+[#147]: https://github.com/RustCrypto/universal-hashes/pull/147
+
 ## 0.7.2 (2021-08-27)
 ### Changed
 - Bump `cpufeatures` dependency to v0.2 ([#136])
diff --git a/poly1305/Cargo.toml b/poly1305/Cargo.toml
@@ -9,12 +9,13 @@ repository = "https://github.com/RustCrypto/universal-hashes"
 keywords = ["crypto", "chacha20", "mac", "salsa20", "universal-hashing"]
 categories = ["cryptography", "no-std"]
 readme = "README.md"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"
 
 [dependencies]
 opaque-debug = "0.3"
 universal-hash = { version = "0.4", default-features = false }
-zeroize = { version = ">=1, <1.4", optional = true, default-features = false }
+zeroize = { version = "1", optional = true, default-features = false }
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]
 cpufeatures = "0.2"
diff --git a/poly1305/README.md b/poly1305/README.md
@@ -53,7 +53,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/poly1305/badge.svg
 [docs-link]: https://docs.rs/poly1305/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
 [build-image]: https://github.com/RustCrypto/universal-hashes/workflows/poly1305/badge.svg?branch=master&event=push
 [build-link]: https://github.com/RustCrypto/universal-hashes/actions?query=workflow%3Apoly1305
 
diff --git a/poly1305/src/backend/avx2.rs b/poly1305/src/backend/avx2.rs
@@ -15,7 +15,6 @@
 // optimisations provided by Bhattacharyya and Sarkar. The latter require the message
 // length to be known, which is incompatible with the streaming API of UniversalHash.
 
-use core::convert::TryInto;
 use universal_hash::generic_array::GenericArray;
 
 use crate::{Block, Key, Tag};
diff --git a/poly1305/src/backend/avx2/helpers.rs b/poly1305/src/backend/avx2/helpers.rs
@@ -76,8 +76,6 @@ pub(super) struct Aligned130(pub(super) __m256i);
 
 impl fmt::Display for Aligned130 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use core::convert::TryInto;
-
         let mut v0 = [0u8; 32];
         unsafe {
             _mm256_storeu_si256(v0.as_mut_ptr() as *mut _, self.0);
@@ -416,8 +414,6 @@ pub(super) struct Unreduced130 {
 
 impl fmt::Display for Unreduced130 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use core::convert::TryInto;
-
         let mut v0 = [0u8; 32];
         let mut v1 = [0u8; 32];
         unsafe {
@@ -897,8 +893,6 @@ pub(super) struct Aligned4x130 {
 
 impl fmt::Display for Aligned4x130 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use core::convert::TryInto;
-
         let mut v0 = [0u8; 32];
         let mut v1 = [0u8; 32];
         let mut v2 = [0u8; 32];
@@ -1577,8 +1571,6 @@ pub(super) struct Unreduced4x130 {
 
 impl fmt::Display for Unreduced4x130 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use core::convert::TryInto;
-
         let mut v0 = [0u8; 32];
         let mut v1 = [0u8; 32];
         let mut v2 = [0u8; 32];
diff --git a/poly1305/src/backend/soft.rs b/poly1305/src/backend/soft.rs
@@ -13,7 +13,6 @@
 // https://github.com/floodyberry/poly1305-donna
 
 use crate::{Block, Key, Tag};
-use core::convert::TryInto;
 
 #[derive(Clone, Default)]
 pub(crate) struct State {
diff --git a/poly1305/src/lib.rs b/poly1305/src/lib.rs
@@ -14,7 +14,7 @@
 //!
 //! # Minimum Supported Rust Version
 //!
-//! Rust **1.49** or higher.
+//! Rust **1.56** or higher.
 //!
 //! Minimum supported Rust version may be changed in the future, but such
 //! changes will be accompanied with a minor version bump.
diff --git a/polyval/CHANGELOG.md b/polyval/CHANGELOG.md
@@ -8,9 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ### Changed
 - Remove `sse4.1` from CPU feature requirements for PCLMUL backend ([#143])
+- Relax `zeroize` constraints ([#147])
+- Upgrade to Rust 2021 edition ([#147])
 
 [#143]: https://github.com/RustCrypto/universal-hashes/pull/143
-
+[#147]: https://github.com/RustCrypto/universal-hashes/pull/147
 
 ## 0.5.3 (2021-08-27)
 ### Changed
diff --git a/polyval/Cargo.toml b/polyval/Cargo.toml
@@ -12,13 +12,14 @@ repository = "https://github.com/RustCrypto/universal-hashes"
 readme = "README.md"
 keywords = ["aes-gcm", "aes-gcm-siv", "crypto", "ghash", "universal-hashing"]
 categories = ["cryptography", "no-std"]
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"
 
 [dependencies]
 cfg-if = "1"
 opaque-debug = "0.3"
 universal-hash = { version = "0.4", default-features = false }
-zeroize = { version = ">=1, <1.4", optional = true, default-features = false }
+zeroize = { version = "1", optional = true, default-features = false }
 
 [target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]
 cpufeatures = "0.2"
diff --git a/polyval/README.md b/polyval/README.md
@@ -52,7 +52,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/polyval/badge.svg
 [docs-link]: https://docs.rs/polyval/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
 [build-image]: https://github.com/RustCrypto/universal-hashes/workflows/polyval/badge.svg?branch=master&event=push
 [build-link]: https://github.com/RustCrypto/universal-hashes/actions?query=workflow%3Apolyval
 
diff --git a/polyval/src/backend/soft32.rs b/polyval/src/backend/soft32.rs
diff --git a/polyval/src/backend/soft64.rs b/polyval/src/backend/soft64.rs
diff --git a/polyval/src/lib.rs b/polyval/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@ members = [`
`4`	`4`	`"poly1305",`
`5`	`5`	`"polyval"`
`6`	`6`	`]`
	`7`	`+resolver = "2"`