From cb46043221156413192aab8b01b885deb72ff133 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Mon, 20 Jul 2020 14:42:53 -0700
Subject: [PATCH] Upgrade to opaque-debug 0.3

---
 Cargo.lock                | 4 ++--
 aes/aes-soft/Cargo.toml   | 2 +-
 aes/aes-soft/src/impls.rs | 2 +-
 aes/aes-soft/src/lib.rs   | 3 ---
 aes/aesni/Cargo.toml      | 2 +-
 aes/aesni/src/aes128.rs   | 2 +-
 aes/aesni/src/aes192.rs   | 2 +-
 aes/aesni/src/aes256.rs   | 2 +-
 aes/aesni/src/ctr.rs      | 2 +-
 aes/aesni/src/lib.rs      | 3 ---
 blowfish/Cargo.toml       | 2 +-
 blowfish/src/lib.rs       | 5 +----
 cast5/Cargo.toml          | 2 +-
 cast5/src/cast5.rs        | 2 +-
 cast5/src/lib.rs          | 3 ---
 des/Cargo.toml            | 2 +-
 des/src/des.rs            | 2 +-
 des/src/lib.rs            | 3 ---
 des/src/tdes.rs           | 8 ++++----
 idea/Cargo.toml           | 2 +-
 idea/src/lib.rs           | 5 +----
 kuznyechik/Cargo.toml     | 2 +-
 kuznyechik/src/lib.rs     | 5 +----
 magma/Cargo.toml          | 2 +-
 magma/src/construct.rs    | 2 +-
 magma/src/lib.rs          | 3 ---
 rc2/Cargo.toml            | 2 +-
 rc2/src/lib.rs            | 5 +----
 serpent/Cargo.toml        | 2 +-
 serpent/src/lib.rs        | 5 +----
 sm4/Cargo.toml            | 2 +-
 twofish/Cargo.toml        | 2 +-
 twofish/src/lib.rs        | 5 +----
 33 files changed, 32 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f044e5c..5bd13778 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -169,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "opaque-debug"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "proc-macro-hack"
diff --git a/aes/aes-soft/Cargo.toml b/aes/aes-soft/Cargo.toml
index d5794025..b97aef94 100644
--- a/aes/aes-soft/Cargo.toml
+++ b/aes/aes-soft/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 byteorder = { version = "1", default-features = false }
 
 [dev-dependencies]
diff --git a/aes/aes-soft/src/impls.rs b/aes/aes-soft/src/impls.rs
index 94733cc0..161a6ccb 100644
--- a/aes/aes-soft/src/impls.rs
+++ b/aes/aes-soft/src/impls.rs
@@ -107,7 +107,7 @@ macro_rules! define_aes_impl {
             }
         }
 
-        impl_opaque_debug!($name);
+        opaque_debug::implement!($name);
     }
 }
 
diff --git a/aes/aes-soft/src/lib.rs b/aes/aes-soft/src/lib.rs
index c3badeaa..89f84f57 100644
--- a/aes/aes-soft/src/lib.rs
+++ b/aes/aes-soft/src/lib.rs
@@ -40,9 +40,6 @@
 
 pub use block_cipher;
 
-#[macro_use]
-extern crate opaque_debug;
-
 mod bitslice;
 mod consts;
 mod expand;
diff --git a/aes/aesni/Cargo.toml b/aes/aesni/Cargo.toml
index 9efb1526..393b51ab 100644
--- a/aes/aesni/Cargo.toml
+++ b/aes/aesni/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 stream-cipher = { version = "0.6", optional = true, features = ["block-cipher"] }
 
 [dev-dependencies]
diff --git a/aes/aesni/src/aes128.rs b/aes/aesni/src/aes128.rs
index e93e01c5..b686801c 100644
--- a/aes/aesni/src/aes128.rs
+++ b/aes/aesni/src/aes128.rs
@@ -138,4 +138,4 @@ impl BlockCipher for Aes128 {
     }
 }
 
-impl_opaque_debug!(Aes128);
+opaque_debug::implement!(Aes128);
diff --git a/aes/aesni/src/aes192.rs b/aes/aesni/src/aes192.rs
index c0432c30..cea04ae2 100644
--- a/aes/aesni/src/aes192.rs
+++ b/aes/aesni/src/aes192.rs
@@ -144,4 +144,4 @@ impl BlockCipher for Aes192 {
     }
 }
 
-impl_opaque_debug!(Aes192);
+opaque_debug::implement!(Aes192);
diff --git a/aes/aesni/src/aes256.rs b/aes/aesni/src/aes256.rs
index 721e416e..da32db38 100644
--- a/aes/aesni/src/aes256.rs
+++ b/aes/aesni/src/aes256.rs
@@ -152,4 +152,4 @@ impl BlockCipher for Aes256 {
     }
 }
 
-impl_opaque_debug!(Aes256);
+opaque_debug::implement!(Aes256);
diff --git a/aes/aesni/src/ctr.rs b/aes/aesni/src/ctr.rs
index fc9fc611..56f15e5e 100644
--- a/aes/aesni/src/ctr.rs
+++ b/aes/aesni/src/ctr.rs
@@ -235,7 +235,7 @@ macro_rules! impl_ctr {
             }
         }
 
-        impl_opaque_debug!($name);
+        opaque_debug::implement!($name);
     }
 }
 
diff --git a/aes/aesni/src/lib.rs b/aes/aesni/src/lib.rs
index 1bdc84a7..b782e4f2 100644
--- a/aes/aesni/src/lib.rs
+++ b/aes/aesni/src/lib.rs
@@ -75,9 +75,6 @@
 #![doc(html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
 #![warn(missing_docs, rust_2018_idioms)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 #[cfg(feature = "ctr")]
diff --git a/blowfish/Cargo.toml b/blowfish/Cargo.toml
index a19ad965..b7a2d319 100644
--- a/blowfish/Cargo.toml
+++ b/blowfish/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
 [dependencies]
 block-cipher = "0.8"
 byteorder = { version = "1", default-features = false }
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/blowfish/src/lib.rs b/blowfish/src/lib.rs
index f8330c43..e1a3d573 100644
--- a/blowfish/src/lib.rs
+++ b/blowfish/src/lib.rs
@@ -5,9 +5,6 @@
 #![forbid(unsafe_code)]
 #![warn(missing_docs, rust_2018_idioms)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 use block_cipher::consts::{U1, U56, U8};
@@ -202,4 +199,4 @@ impl Blowfish<BE> {
     }
 }
 
-impl_opaque_debug!(Blowfish);
+opaque_debug::implement!(Blowfish);
diff --git a/cast5/Cargo.toml b/cast5/Cargo.toml
index 96d11d72..059bdb8c 100644
--- a/cast5/Cargo.toml
+++ b/cast5/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 byteorder = { version = "1", default-features = false }
 
 [dev-dependencies]
diff --git a/cast5/src/cast5.rs b/cast5/src/cast5.rs
index b7aed099..637673be 100644
--- a/cast5/src/cast5.rs
+++ b/cast5/src/cast5.rs
@@ -190,4 +190,4 @@ impl BlockCipher for Cast5 {
     }
 }
 
-impl_opaque_debug!(Cast5);
+opaque_debug::implement!(Cast5);
diff --git a/cast5/src/lib.rs b/cast5/src/lib.rs
index 5d9ed834..068f9aeb 100644
--- a/cast5/src/lib.rs
+++ b/cast5/src/lib.rs
@@ -27,9 +27,6 @@
 #![forbid(unsafe_code)]
 #![warn(missing_docs, rust_2018_idioms)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher::{self, BlockCipher};
 
 mod cast5;
diff --git a/des/Cargo.toml b/des/Cargo.toml
index 4108b5a9..a8a1d5b6 100644
--- a/des/Cargo.toml
+++ b/des/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
 [dependencies]
 block-cipher = "0.8"
 byteorder = { version = "1", default-features = false }
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/des/src/des.rs b/des/src/des.rs
index 720c2f71..971ad9c2 100644
--- a/des/src/des.rs
+++ b/des/src/des.rs
@@ -209,4 +209,4 @@ impl BlockCipher for Des {
     }
 }
 
-impl_opaque_debug!(Des);
+opaque_debug::implement!(Des);
diff --git a/des/src/lib.rs b/des/src/lib.rs
index 735babee..270e75f9 100644
--- a/des/src/lib.rs
+++ b/des/src/lib.rs
@@ -7,9 +7,6 @@
 #![forbid(unsafe_code)]
 #![warn(missing_docs, rust_2018_idioms)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 mod consts;
diff --git a/des/src/tdes.rs b/des/src/tdes.rs
index 5e213a37..ce0d5bc7 100644
--- a/des/src/tdes.rs
+++ b/des/src/tdes.rs
@@ -198,7 +198,7 @@ impl BlockCipher for TdesEee2 {
     }
 }
 
-impl_opaque_debug!(TdesEde3);
-impl_opaque_debug!(TdesEee3);
-impl_opaque_debug!(TdesEde2);
-impl_opaque_debug!(TdesEee2);
+opaque_debug::implement!(TdesEde3);
+opaque_debug::implement!(TdesEee3);
+opaque_debug::implement!(TdesEde2);
+opaque_debug::implement!(TdesEee2);
diff --git a/idea/Cargo.toml b/idea/Cargo.toml
index 1a1885aa..d470aac0 100644
--- a/idea/Cargo.toml
+++ b/idea/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/idea/src/lib.rs b/idea/src/lib.rs
index c7a97988..1acd6143 100644
--- a/idea/src/lib.rs
+++ b/idea/src/lib.rs
@@ -8,9 +8,6 @@
 #![warn(missing_docs, rust_2018_idioms)]
 #![allow(clippy::many_single_char_names)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 use block_cipher::consts::{U1, U16, U8};
@@ -194,7 +191,7 @@ impl BlockCipher for Idea {
     }
 }
 
-impl_opaque_debug!(Idea);
+opaque_debug::implement!(Idea);
 
 #[cfg(test)]
 mod tests;
diff --git a/kuznyechik/Cargo.toml b/kuznyechik/Cargo.toml
index 6088e398..b5d7b7b0 100644
--- a/kuznyechik/Cargo.toml
+++ b/kuznyechik/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/kuznyechik/src/lib.rs b/kuznyechik/src/lib.rs
index f1d80646..2a63188e 100644
--- a/kuznyechik/src/lib.rs
+++ b/kuznyechik/src/lib.rs
@@ -7,9 +7,6 @@
 #![warn(missing_docs, rust_2018_idioms)]
 #![allow(clippy::needless_range_loop, clippy::transmute_ptr_to_ptr)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 use block_cipher::consts::{U1, U16, U32};
@@ -167,4 +164,4 @@ impl BlockCipher for Kuznyechik {
     }
 }
 
-impl_opaque_debug!(Kuznyechik);
+opaque_debug::implement!(Kuznyechik);
diff --git a/magma/Cargo.toml b/magma/Cargo.toml
index 0089426f..91050307 100644
--- a/magma/Cargo.toml
+++ b/magma/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
 [dependencies]
 byteorder = { version = "1", default-features = false }
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/magma/src/construct.rs b/magma/src/construct.rs
index c65504ea..5aa97872 100644
--- a/magma/src/construct.rs
+++ b/magma/src/construct.rs
@@ -33,6 +33,6 @@ macro_rules! construct_cipher {
             }
         }
 
-        impl_opaque_debug!($name);
+        opaque_debug::implement!($name);
     };
 }
diff --git a/magma/src/lib.rs b/magma/src/lib.rs
index d737e035..a0fea550 100644
--- a/magma/src/lib.rs
+++ b/magma/src/lib.rs
@@ -6,9 +6,6 @@
 #![deny(unsafe_code)]
 #![warn(rust_2018_idioms)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 mod sboxes_exp;
 #[macro_use]
 mod construct;
diff --git a/rc2/Cargo.toml b/rc2/Cargo.toml
index 062ff07d..1774ae16 100644
--- a/rc2/Cargo.toml
+++ b/rc2/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/rc2/src/lib.rs b/rc2/src/lib.rs
index 3d1f07ff..bcf65538 100644
--- a/rc2/src/lib.rs
+++ b/rc2/src/lib.rs
@@ -7,9 +7,6 @@
 #![forbid(unsafe_code)]
 #![warn(rust_2018_idioms)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 use block_cipher::consts::{U1, U32, U8};
@@ -221,4 +218,4 @@ impl BlockCipher for Rc2 {
     }
 }
 
-impl_opaque_debug!(Rc2);
+opaque_debug::implement!(Rc2);
diff --git a/serpent/Cargo.toml b/serpent/Cargo.toml
index f68b9491..021dea8d 100644
--- a/serpent/Cargo.toml
+++ b/serpent/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
 [dependencies]
 byteorder = { version = "1", default-features = false }
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/serpent/src/lib.rs b/serpent/src/lib.rs
index fac2b44d..66e06d88 100644
--- a/serpent/src/lib.rs
+++ b/serpent/src/lib.rs
@@ -10,9 +10,6 @@
 #![warn(missing_docs, rust_2018_idioms)]
 #![allow(clippy::needless_range_loop)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 use block_cipher::consts::{U1, U16};
@@ -282,4 +279,4 @@ impl BlockCipher for Serpent {
     }
 }
 
-impl_opaque_debug!(Serpent);
+opaque_debug::implement!(Serpent);
diff --git a/sm4/Cargo.toml b/sm4/Cargo.toml
index b9907f27..89d239e4 100644
--- a/sm4/Cargo.toml
+++ b/sm4/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["cryptography"]
 [dependencies]
 block-cipher = "0.8"
 byteorder = { version = "1", default-features = false }
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/twofish/Cargo.toml b/twofish/Cargo.toml
index a4ec836c..4c3039db 100644
--- a/twofish/Cargo.toml
+++ b/twofish/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
 [dependencies]
 byteorder = { version = "1", default-features = false }
 block-cipher = "0.8"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 
 [dev-dependencies]
 block-cipher = { version = "0.8", features = ["dev"] }
diff --git a/twofish/src/lib.rs b/twofish/src/lib.rs
index 98c4a04d..00e306d0 100644
--- a/twofish/src/lib.rs
+++ b/twofish/src/lib.rs
@@ -6,9 +6,6 @@
 #![warn(missing_docs, rust_2018_idioms)]
 #![allow(clippy::needless_range_loop, clippy::unreadable_literal)]
 
-#[macro_use]
-extern crate opaque_debug;
-
 pub use block_cipher;
 
 use block_cipher::consts::{U1, U16, U32};
@@ -249,7 +246,7 @@ impl BlockCipher for Twofish {
     }
 }
 
-impl_opaque_debug!(Twofish);
+opaque_debug::implement!(Twofish);
 
 #[cfg(test)]
 mod tests;