keccak: 2021 edition upgrade; MSRV 1.60 (#70)

`keccak` was previously excluded from the toplevel workspace due to its
MSRV of 1.41 and incompatibilities with packages used by `ascon`.

This bumps the edition, changes the version to `0.2.0-pre` to denote it
contains breaking changes (though this is not intended to be a
`0.2.0-pre` release), and bumps MSRV.

With the MSRV bumped, `keccak` can and has been re-added to the toplevel
workspace.

.github/workflows/keccak.yml

@@ -21,7 +21,7 @@ jobs:
   set-msrv:
     uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
     with:
-        msrv: 1.41.0
+        msrv: 1.60.0
 
   build:
     needs: set-msrv

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
-exclude = ["keccak"] # TODO(tarcieri): add back to `members` when MSRV >= 1.56
+resolver = "2"
 members = [
     "ascon",
-    #"keccak",
+    "keccak",
 ]

keccak/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "keccak"
-version = "0.1.5"
+version = "0.2.0-pre"
 description = """
 Pure Rust implementation of the Keccak sponge function including the keccak-f
 and keccak-p variants
@@ -12,7 +12,8 @@ repository = "https://github.com/RustCrypto/sponges/tree/master/keccak"
 keywords = ["crypto", "sponge", "keccak", "keccak-f", "keccak-p"]
 categories = ["cryptography", "no-std"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
+rust-version = "1.60"
 
 [features]
 asm = []       # Use optimized assembly when available (currently only ARMv8)

keccak/README.md

@@ -22,7 +22,7 @@ is built on this crate.
 
 ## Minimum Supported Rust Version
 
-Rust **1.41** or higher by default, or **1.59** with the `asm` feature enabled.
+Rust **1.60** or higher.
 
 Minimum supported Rust version can be changed in the future, but it will be
 done with a minor version bump.
@@ -56,7 +56,7 @@ dual licensed as above, without any additional terms or conditions.
 [build-image]: https://github.com/RustCrypto/sponges/actions/workflows/keccak.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/sponges/actions/workflows/keccak.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/369879-sponges
 

keccak/src/lib.rs

@@ -54,7 +54,6 @@
 )]
 
 use core::{
-    convert::TryInto,
     fmt::Debug,
     mem::size_of,
     ops::{BitAnd, BitAndAssign, BitXor, BitXorAssign, Not},