fix: remove the unmaintained proc-macro-error dependency

.github/workflows/build.yml

@@ -100,7 +100,7 @@ jobs:
     name: Code Coverage
     runs-on: ubuntu-latest
     container:
-      image: xd009642/tarpaulin:0.30.0
+      image: xd009642/tarpaulin:0.31.2
       options: --security-opt seccomp=unconfined
     steps:
       - name: Checkout repository

codetable/Cargo.toml

@@ -29,7 +29,7 @@ digest = { version = "0.10.1", default-features = false, optional = true }
 sha1 = { version = "0.10.5", default-features = false, optional = true }
 sha2 = { version = "0.10.0", default-features = false, optional = true }
 sha3 = { version = "0.10.0", default-features = false, optional = true }
-strobe-rs = { version = "0.8.1", default-features = false, optional = true }
+strobe-rs = { version = "0.10.0", default-features = false, optional = true }
 ripemd = { version = "0.1.1", default-features = false, optional = true }
 multihash-derive = { version = "0.9.0", path = "../derive", default-features = false }
 core2 = { version = "0.4.0", default-features = false }

codetable/src/hasher_impl.rs

@@ -1,6 +1,5 @@
 #[cfg(any(
     feature = "strobe",
-    feature = "identity",
     feature = "blake2b",
     feature = "blake2s",
     feature = "blake3"

codetable/src/lib.rs

@@ -1,5 +1,5 @@
 #![cfg_attr(feature = "arb", allow(unreachable_code))] // Otherwise the "Cargo Hack" check fails since "arb" includes no hash algos by default
-#![cfg_attr(docs_rs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 //! A batteries-included code table of multihashes.
@@ -15,30 +15,30 @@ mod hasher_impl;
 pub use multihash_derive::MultihashDigest;
 
 #[cfg(feature = "blake2b")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "blake2b")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "blake2b")))]
 pub use crate::hasher_impl::blake2b::{Blake2b256, Blake2b512, Blake2bHasher};
 #[cfg(feature = "blake2s")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "blake2s")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "blake2s")))]
 pub use crate::hasher_impl::blake2s::{Blake2s128, Blake2s256, Blake2sHasher};
 #[cfg(feature = "blake3")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "blake3")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "blake3")))]
 pub use crate::hasher_impl::blake3::{Blake3Hasher, Blake3_256};
 #[cfg(feature = "ripemd")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "ripemd")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "ripemd")))]
 pub use crate::hasher_impl::ripemd::{Ripemd160, Ripemd256, Ripemd320};
 #[cfg(feature = "sha1")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "sha1")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "sha1")))]
 pub use crate::hasher_impl::sha1::Sha1;
 #[cfg(feature = "sha2")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "sha2")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "sha2")))]
 pub use crate::hasher_impl::sha2::{Sha2_256, Sha2_512};
 #[cfg(feature = "sha3")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
 pub use crate::hasher_impl::sha3::{
     Keccak224, Keccak256, Keccak384, Keccak512, Sha3_224, Sha3_256, Sha3_384, Sha3_512,
 };
 #[cfg(feature = "strobe")]
-#[cfg_attr(docs_rs, doc(cfg(feature = "strobe")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "strobe")))]
 pub use crate::hasher_impl::strobe::{Strobe256, Strobe512, StrobeHasher};
 
 /// Default (cryptographically secure) Multihash implementation.
@@ -54,92 +54,92 @@ pub use crate::hasher_impl::strobe::{Strobe256, Strobe512, StrobeHasher};
 pub enum Code {
     /// SHA-256 (32-byte hash size)
     #[cfg(feature = "sha2")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha2")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha2")))]
     #[mh(code = 0x12, hasher = crate::Sha2_256)]
     Sha2_256,
     /// SHA-512 (64-byte hash size)
     #[cfg(feature = "sha2")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha2")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha2")))]
     #[mh(code = 0x13, hasher = crate::Sha2_512)]
     Sha2_512,
     /// SHA3-224 (28-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x17, hasher = crate::Sha3_224)]
     Sha3_224,
     /// SHA3-256 (32-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x16, hasher = crate::Sha3_256)]
     Sha3_256,
     /// SHA3-384 (48-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x15, hasher = crate::Sha3_384)]
     Sha3_384,
     /// SHA3-512 (64-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x14, hasher = crate::Sha3_512)]
     Sha3_512,
     /// Keccak-224 (28-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x1a, hasher = crate::Keccak224)]
     Keccak224,
     /// Keccak-256 (32-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x1b, hasher = crate::Keccak256)]
     Keccak256,
     /// Keccak-384 (48-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x1c, hasher = crate::Keccak384)]
     Keccak384,
     /// Keccak-512 (64-byte hash size)
     #[cfg(feature = "sha3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "sha3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sha3")))]
     #[mh(code = 0x1d, hasher = crate::Keccak512)]
     Keccak512,
     /// BLAKE2b-256 (32-byte hash size)
     #[cfg(feature = "blake2b")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "blake2b")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "blake2b")))]
     #[mh(code = 0xb220, hasher = crate::Blake2b256)]
     Blake2b256,
     /// BLAKE2b-512 (64-byte hash size)
     #[cfg(feature = "blake2b")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "blake2b")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "blake2b")))]
     #[mh(code = 0xb240, hasher = crate::Blake2b512)]
     Blake2b512,
     /// BLAKE2s-128 (16-byte hash size)
     #[cfg(feature = "blake2s")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "blake2s")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "blake2s")))]
     #[mh(code = 0xb250, hasher = crate::Blake2s128)]
     Blake2s128,
     /// BLAKE2s-256 (32-byte hash size)
     #[cfg(feature = "blake2s")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "blake2s")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "blake2s")))]
     #[mh(code = 0xb260, hasher = crate::Blake2s256)]
     Blake2s256,
     /// BLAKE3-256 (32-byte hash size)
     #[cfg(feature = "blake3")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "blake3")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "blake3")))]
     #[mh(code = 0x1e, hasher = crate::Blake3_256)]
     Blake3_256,
     /// RIPEMD-160 (20-byte hash size)
     #[cfg(feature = "ripemd")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "ripemd")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "ripemd")))]
     #[mh(code = 0x1053, hasher = crate::Ripemd160)]
     Ripemd160,
     /// RIPEMD-256 (32-byte hash size)
     #[cfg(feature = "ripemd")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "ripemd")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "ripemd")))]
     #[mh(code = 0x1054, hasher = crate::Ripemd256)]
     Ripemd256,
     /// RIPEMD-320 (40-byte hash size)
     #[cfg(feature = "ripemd")]
-    #[cfg_attr(docs_rs, doc(cfg(feature = "ripemd")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "ripemd")))]
     #[mh(code = 0x1055, hasher = crate::Ripemd320)]
     Ripemd320,
 }

deny.toml

@@ -1,32 +1,11 @@
-
-[advisories]
-ignore = [
-    # https://rustsec.org/advisories/RUSTSEC-2021-0145
-    # 1. On windows, `atty` dereferences a potentially unaligned pointer.
-    # 2. Last release of `atty` was almost 3 years ago.
-    "RUSTSEC-2021-0145",
-
-    # https://rustsec.org/advisories/RUSTSEC-2021-0127
-    # 1. serde_cbor is unmaintained
-    "RUSTSEC-2021-0127"
-]
-notice = "deny"
-unmaintained = "warn"
-vulnerability = "deny"
-yanked = "deny"
-
 [licenses]
 allow = [
     "Apache-2.0",
-    "BSD-2-Clause",
     "BSD-3-Clause",
-    "CC0-1.0",
     "MIT",
     "Unicode-DFS-2016",
 ]
-default = "deny"
 confidence-threshold = 1.0
-unlicensed = "deny"
 
 [bans]
 allow = []
@@ -35,10 +14,11 @@ deny = []
 #   * Resolve duplicate versions of itoa (used by criterion)
 #   * Remove atty from criterion
 #   * Resolve duplicate versions of constant_time_eq (used by blake2_sid and blake3)
-multiple-versions = "warn"
+multiple-versions = "deny"
 skip = []
 skip-tree = []
-wildcards = "warn"
+wildcards = "deny"
+allow-wildcard-paths = true
 
 [sources]
 allow-git = []

derive-impl/Cargo.toml

@@ -13,7 +13,6 @@ proc-macro = true
 [dependencies]
 proc-macro2 = { version = "1.0.24", features = ["span-locations"] }
 proc-macro-crate = "3.1.0"
-proc-macro-error = "1.0.4"
 quote = "1.0.7"
 syn = "2.0.66"
 synstructure = "0.13.1"

derive-impl/src/lib.rs

@@ -10,13 +10,11 @@ mod multihash;
 mod utils;
 
 use proc_macro::TokenStream;
-use proc_macro_error::proc_macro_error;
 use synstructure::macros::{parse, DeriveInput};
 use synstructure::{MacroResult, Structure};
 
 #[proc_macro_derive(Multihash, attributes(mh))]
 #[allow(non_snake_case)]
-#[proc_macro_error]
 #[deprecated(since = "0.8.1", note = "Use `MultihashDigest` derive instead.")]
 pub fn Multihash(i: TokenStream) -> TokenStream {
     match parse::<DeriveInput>(i) {
@@ -31,7 +29,6 @@ pub fn Multihash(i: TokenStream) -> TokenStream {
 /// Custom derive for the `MultihashDigest` trait.
 #[proc_macro_derive(MultihashDigest, attributes(mh))]
 #[allow(non_snake_case)]
-#[proc_macro_error]
 pub fn MultihashDigest(i: TokenStream) -> TokenStream {
     #[allow(deprecated)]
     Multihash(i)