Migrate to core::error::Error (#1711)

newpavlov · web-flow · commit f5266b8737aa · 2024-11-15T04:17:29.000+03:00
diff --git a/.github/workflows/async-signature.yml b/.github/workflows/async-signature.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
diff --git a/.github/workflows/password-hash.yml b/.github/workflows/password-hash.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.60.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -57,7 +57,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.60.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/signature.yml b/.github/workflows/signature.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
diff --git a/async-signature/Cargo.toml b/async-signature/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 keywords = ["crypto", "ecdsa", "ed25519", "signature", "signing"]
 categories = ["cryptography", "no-std"]
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.81"
 
 [dependencies]
 signature = "=2.3.0-pre.4"
diff --git a/async-signature/README.md b/async-signature/README.md
@@ -9,7 +9,7 @@
 
 ## Minimum Supported Rust Version
 
-Rust **1.75** or higher.
+Rust **1.81** or higher.
 
 Minimum supported Rust version can be changed in the future, but it will be
 done with a minor version bump.
@@ -36,7 +36,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/async-signature/badge.svg
 [docs-link]: https://docs.rs/async-signature/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.75+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260048-signatures
 [build-image]: https://github.com/RustCrypto/traits/workflows/async-signature/badge.svg?branch=master&event=push
diff --git a/digest/src/lib.rs b/digest/src/lib.rs
@@ -284,8 +284,7 @@ impl fmt::Display for InvalidOutputSize {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for InvalidOutputSize {}
+impl core::error::Error for InvalidOutputSize {}
 
 /// Buffer length is not equal to hash output size.
 #[derive(Default, Debug, Copy, Clone, Eq, PartialEq)]
@@ -297,8 +296,7 @@ impl fmt::Display for InvalidBufferSize {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for InvalidBufferSize {}
+impl core::error::Error for InvalidBufferSize {}
 
 #[cfg(feature = "std")]
 mod hashwriter;
diff --git a/digest/src/mac.rs b/digest/src/mac.rs
@@ -278,5 +278,4 @@ impl fmt::Display for MacError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for MacError {}
+impl core::error::Error for MacError {}
diff --git a/password-hash/Cargo.toml b/password-hash/Cargo.toml
@@ -15,7 +15,7 @@ repository = "https://github.com/RustCrypto/traits"
 categories = ["authentication", "cryptography", "no-std"]
 keywords = ["crypt", "mcf", "password", "pbkdf", "phc"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.81"
 
 [dependencies]
 base64ct = "1.6"
@@ -27,7 +27,6 @@ rand_core = { version = "0.6.4", optional = true, default-features = false }
 [features]
 default = ["rand_core"]
 alloc = ["base64ct/alloc"]
-std = ["alloc", "base64ct/std", "rand_core/std"]
 
 getrandom = ["rand_core/getrandom"]
 
diff --git a/password-hash/README.md b/password-hash/README.md
@@ -29,7 +29,7 @@ this crate for interoperability:
 
 ## Minimum Supported Rust Version
 
-Rust **1.60** or higher.
+Rust **1.81** or higher.
 
 Minimum supported Rust version may be changed in the future, but it will be
 accompanied by a minor version bump.
@@ -63,7 +63,7 @@ dual licensed as above, without any additional terms or conditions.
 [build-image]: https://github.com/RustCrypto/traits/workflows/password-hash/badge.svg?branch=master&event=push
 [build-link]: https://github.com/RustCrypto/traits/actions?query=workflow:password-hash
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260046-password-hashes
 
diff --git a/password-hash/src/errors.rs b/password-hash/src/errors.rs
@@ -99,11 +99,11 @@ impl fmt::Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Error {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+impl core::error::Error for Error {
+    fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
         match self {
-            Self::B64Encoding(err) => Some(err),
+            // TODO: restore after base64ct will migrate to core::error::Error
+            // Self::B64Encoding(err) => Some(err),
             Self::ParamValueInvalid(err) => Some(err),
             Self::SaltInvalid(err) => Some(err),
             _ => None,
@@ -167,5 +167,4 @@ impl fmt::Display for InvalidValue {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for InvalidValue {}
+impl core::error::Error for InvalidValue {}
diff --git a/password-hash/src/lib.rs b/password-hash/src/lib.rs
@@ -27,8 +27,6 @@
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
-#[cfg(feature = "std")]
-extern crate std;
 
 #[cfg(feature = "rand_core")]
 pub use rand_core;
diff --git a/signature/Cargo.toml b/signature/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 keywords = ["crypto", "ecdsa", "ed25519", "signature", "signing"]
 categories = ["cryptography", "no-std"]
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.81"
 
 [dependencies]
 derive = { package = "signature_derive", version = "2", optional = true, path = "../signature_derive" }
@@ -24,6 +24,7 @@ sha2 = { version = "=0.11.0-pre.4", default-features = false }
 
 [features]
 alloc = []
+# TODO: remove this feature in the next breaking release
 std = ["alloc", "rand_core?/std"]
 
 [package.metadata.docs.rs]
diff --git a/signature/README.md b/signature/README.md
@@ -17,7 +17,7 @@ the [RustCrypto] organization, as well as [`ed25519-dalek`].
 
 ## Minimum Supported Rust Version
 
-Rust **1.72** or higher.
+Rust **1.81** 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/traits/actions/workflows/signature.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/traits/actions/workflows/signature.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.72+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260048-signatures
 
diff --git a/signature/src/error.rs b/signature/src/error.rs
@@ -2,8 +2,8 @@
 
 use core::fmt::{self, Debug, Display};
 
-#[cfg(feature = "std")]
-use std::boxed::Box;
+#[cfg(feature = "alloc")]
+use alloc::boxed::Box;
 
 /// Result type.
 ///
@@ -16,17 +16,16 @@ pub type Result<T> = core::result::Result<T, Error>;
 /// could potentially be used recover signing private keys or forge signatures
 /// (e.g. [BB'06]).
 ///
-/// When the `std` feature is enabled, it impls [`std::error::Error`] and
-/// supports an optional [`std::error::Error::source`], which can be used by
-/// things like remote signers (e.g. HSM, KMS) to report I/O or auth errors.
+/// When the `alloc` feature is enabled, it supports an optional [`core::error::Error::source`],
+/// which can be used by things like remote signers (e.g. HSM, KMS) to report I/O or auth errors.
 ///
 /// [BB'06]: https://en.wikipedia.org/wiki/Daniel_Bleichenbacher
 #[derive(Default)]
 #[non_exhaustive]
 pub struct Error {
     /// Source of the error (if applicable).
-    #[cfg(feature = "std")]
-    source: Option<Box<dyn std::error::Error + Send + Sync + 'static>>,
+    #[cfg(feature = "alloc")]
+    source: Option<Box<dyn core::error::Error + Send + Sync + 'static>>,
 }
 
 impl Error {
@@ -41,9 +40,9 @@ impl Error {
     /// errors e.g. signature parsing or verification errors. The intended use
     /// cases are for propagating errors related to external signers, e.g.
     /// communication/authentication errors with HSMs, KMS, etc.
-    #[cfg(feature = "std")]
+    #[cfg(feature = "alloc")]
     pub fn from_source(
-        source: impl Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
+        source: impl Into<Box<dyn core::error::Error + Send + Sync + 'static>>,
     ) -> Self {
         Self {
             source: Some(source.into()),
@@ -52,12 +51,12 @@ impl Error {
 }
 
 impl Debug for Error {
-    #[cfg(not(feature = "std"))]
+    #[cfg(not(feature = "alloc"))]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.write_str("signature::Error {}")
     }
 
-    #[cfg(feature = "std")]
+    #[cfg(feature = "alloc")]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.write_str("signature::Error { source: ")?;
 
@@ -77,31 +76,37 @@ impl Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
-impl From<Box<dyn std::error::Error + Send + Sync + 'static>> for Error {
-    fn from(source: Box<dyn std::error::Error + Send + Sync + 'static>) -> Error {
+#[cfg(feature = "alloc")]
+impl From<Box<dyn core::error::Error + Send + Sync + 'static>> for Error {
+    fn from(source: Box<dyn core::error::Error + Send + Sync + 'static>) -> Error {
         Self::from_source(source)
     }
 }
 
 #[cfg(feature = "rand_core")]
 impl From<rand_core::Error> for Error {
-    #[cfg(not(feature = "std"))]
+    #[cfg(not(feature = "alloc"))]
     fn from(_source: rand_core::Error) -> Error {
         Error::new()
     }
 
-    #[cfg(feature = "std")]
+    #[cfg(feature = "alloc")]
     fn from(source: rand_core::Error) -> Error {
         Error::from_source(source)
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Error {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        self.source
-            .as_ref()
-            .map(|source| source.as_ref() as &(dyn std::error::Error + 'static))
+impl core::error::Error for Error {
+    fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
+        #[cfg(not(feature = "alloc"))]
+        {
+            None
+        }
+        #[cfg(feature = "alloc")]
+        {
+            self.source
+                .as_ref()
+                .map(|source| source.as_ref() as &(dyn core::error::Error + 'static))
+        }
     }
 }
diff --git a/signature/src/lib.rs b/signature/src/lib.rs
@@ -130,8 +130,6 @@
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
-#[cfg(feature = "std")]
-extern crate std;
 
 pub mod hazmat;
 
diff --git a/universal-hash/Cargo.toml b/universal-hash/Cargo.toml
@@ -16,9 +16,6 @@ categories = ["cryptography", "no-std"]
 crypto-common = "0.2.0-rc.0"
 subtle = { version = "2.4", default-features = false }
 
-[features]
-std = []
-
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
diff --git a/universal-hash/src/lib.rs b/universal-hash/src/lib.rs
@@ -8,9 +8,6 @@
 #![forbid(unsafe_code)]
 #![warn(missing_docs, rust_2018_idioms, missing_debug_implementations)]
 
-#[cfg(feature = "std")]
-extern crate std;
-
 pub use crypto_common::{
     self, array,
     typenum::{self, consts},
@@ -152,5 +149,4 @@ impl core::fmt::Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Error {}
+impl core::error::Error for Error {}

Original file line number	Diff line number	Diff line change
`@@ -284,8 +284,7 @@ impl fmt::Display for InvalidOutputSize {`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
`287`		`-#[cfg(feature = "std")]`
`288`		`-impl std::error::Error for InvalidOutputSize {}`
	`287`	`+impl core::error::Error for InvalidOutputSize {}`
`289`	`288`
`290`	`289`	`/// Buffer length is not equal to hash output size.`
`291`	`290`	`#[derive(Default, Debug, Copy, Clone, Eq, PartialEq)]`
`@@ -297,8 +296,7 @@ impl fmt::Display for InvalidBufferSize {`
`297`	`296`	`}`
`298`	`297`	`}`
`299`	`298`
`300`		`-#[cfg(feature = "std")]`
`301`		`-impl std::error::Error for InvalidBufferSize {}`
	`299`	`+impl core::error::Error for InvalidBufferSize {}`
`302`	`300`
`303`	`301`	`#[cfg(feature = "std")]`
`304`	`302`	`mod hashwriter;`
Original file line number	Diff line number	Diff line change
`@@ -278,5 +278,4 @@ impl fmt::Display for MacError {`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`
`281`		`-#[cfg(feature = "std")]`
`282`		`-impl std::error::Error for MacError {}`
	`281`	`+impl core::error::Error for MacError {}`
Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,11 @@ impl fmt::Display for Error {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`-#[cfg(feature = "std")]`
`103`		`-impl std::error::Error for Error {`
`104`		`- fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {`
	`102`	`+impl core::error::Error for Error {`
	`103`	`+ fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {`
`105`	`104`	`match self {`
`106`		`- Self::B64Encoding(err) => Some(err),`
	`105`	`+ // TODO: restore after base64ct will migrate to core::error::Error`
	`106`	`+ // Self::B64Encoding(err) => Some(err),`
`107`	`107`	`Self::ParamValueInvalid(err) => Some(err),`
`108`	`108`	`Self::SaltInvalid(err) => Some(err),`
`109`	`109`	`_ => None,`
`@@ -167,5 +167,4 @@ impl fmt::Display for InvalidValue {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`170`		`-#[cfg(feature = "std")]`
`171`		`-impl std::error::Error for InvalidValue {}`
	`170`	`+impl core::error::Error for InvalidValue {}`