elliptic-curve: Rust 2021 edition upgrade

The RustCrypto/formats repo was bumped to Rust 2021 edition, and some of those crates (e.g. `der`, `sec1`) are hard dependencies for the `elliptic-curve` crate: RustCrypto/formats#136 This is a corresponding Rust 2021 edition bump for the `elliptic-curve` crate, as well as the omnibus `crypto` crate whose MSRV is determined by the highest MSRV crate in this repo.
RustCrypto · Oct 21, 2021 · 79448bd · 79448bd
1 parent aacc4a9
commit 79448bd
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 35 deletions.
diff --git a/.github/workflows/crypto.yml b/.github/workflows/crypto.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.55.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -43,7 +43,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.55.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
     steps:
     - uses: actions/checkout@v1

diff --git a/.github/workflows/elliptic-curve.yml b/.github/workflows/elliptic-curve.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.55.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -54,7 +54,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.55.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
           - nightly
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "crypto"
-version = "0.3.0" # Also update html_root_url in lib.rs when bumping this
+version = "0.4.0-pre" # Also update html_root_url in lib.rs when bumping this
 description = """
 Resources for building cryptosystems in Rust using the RustCrypto project's ecosystem.
 """
@@ -11,7 +11,8 @@ repository = "https://github.com/RustCrypto/traits"
 keywords = ["crypto", "encryption", "rustcrypto"]
 categories = ["cryptography", "no-std"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [dependencies]
 aead = { version = "0.4", optional = true, path = "../aead" }

diff --git a/crypto/README.md b/crypto/README.md
@@ -14,7 +14,7 @@ access compatible versions of all traits from the Rust Crypto project.
 
 ## Minimum Supported Rust Version
 
-Rust **1.55** or higher.
+Rust **1.56** or higher.
 
 Minimum supported Rust version can be changed in the future, but it will be
 done with a minor version bump.
@@ -46,7 +46,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/crypto/badge.svg
 [docs-link]: https://docs.rs/crypto/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.55+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260050-Traits
 [build-image]: https://github.com/RustCrypto/traits/workflows/crypto/badge.svg?branch=master&event=push

diff --git a/crypto/src/lib.rs b/crypto/src/lib.rs
@@ -39,7 +39,7 @@
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
-    html_root_url = "https://docs.rs/crypto/0.3.0"
+    html_root_url = "https://docs.rs/crypto/0.4.0-pre"
 )]
 #![forbid(unsafe_code)]
 #![warn(rust_2018_idioms)]

diff --git a/elliptic-curve/Cargo.toml b/elliptic-curve/Cargo.toml
@@ -5,14 +5,15 @@ General purpose Elliptic Curve Cryptography (ECC) support, including types
 and traits for representing various elliptic curve forms, scalars, points,
 and public/secret keys composed thereof.
 """
-version    = "0.11.0-pre" # Also update html_root_url in lib.rs when bumping this
-authors    = ["RustCrypto Developers"]
-license    = "Apache-2.0 OR MIT"
+version = "0.11.0-pre" # Also update html_root_url in lib.rs when bumping this
+authors = ["RustCrypto Developers"]
+license = "Apache-2.0 OR MIT"
 repository = "https://github.com/RustCrypto/traits/tree/master/elliptic-curve"
-readme     = "README.md"
-edition    = "2018"
+readme = "README.md"
 categories = ["cryptography", "no-std"]
-keywords   = ["crypto", "ecc", "elliptic", "weierstrass"]
+keywords = ["crypto", "ecc", "elliptic", "weierstrass"]
+edition = "2021"
+rust-version = "1.56"
 
 [dependencies]
 crypto-bigint = { version = "0.2.9", features = ["generic-array", "zeroize"] }

diff --git a/elliptic-curve/README.md b/elliptic-curve/README.md
@@ -15,7 +15,7 @@ and public/secret keys composed thereof.
 
 ## Minimum Supported Rust Version
 
-Requires Rust **1.55** or higher.
+Requires Rust **1.56** or higher.
 
 Minimum supported Rust version can be changed in the future, but it will be
 done with a minor version bump.
@@ -47,7 +47,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/elliptic-curve/badge.svg
 [docs-link]: https://docs.rs/elliptic-curve/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.55+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260040-elliptic-curves
 [build-image]: https://github.com/RustCrypto/elliptic-curves/workflows/elliptic-curve%20crate/badge.svg?branch=master&event=push

diff --git a/elliptic-curve/src/lib.rs b/elliptic-curve/src/lib.rs
@@ -4,7 +4,7 @@
 //!
 //! ## Minimum Supported Rust Version
 //!
-//! Rust **1.55** or higher.
+//! Rust **1.56** or higher.
 //!
 //! Minimum supported Rust version can be changed in the future, but it will be
 //! done with a minor version bump.