Remove unnecessary extern crate usage and use 2018 macro imports

Author: tarcieri

Cargo.lock

@@ -21,7 +21,7 @@ opaque-debug = "0.2"
 [dev-dependencies]
 digest = { version = "= 0.9.0-pre", features = ["dev"] }
 crypto-mac = { version = "0.8.0-pre", features = ["dev"] }
-hex-literal = "0.1"
+hex-literal = "0.2"
 
 [features]
 default = ["std"]

blake2/Cargo.toml

@@ -1,5 +1,4 @@
 #![no_std]
 #![feature(test)]
 
-use digest::bench;
-bench!(blake2::Blake2b);
+digest::bench!(blake2::Blake2b);

blake2/benches/blake2b.rs

@@ -1,5 +1,4 @@
 #![no_std]
 #![feature(test)]
 
-use digest::bench;
-bench!(blake2::Blake2s);
+digest::bench!(blake2::Blake2s);

blake2/benches/blake2s.rs

@@ -13,6 +13,7 @@ macro_rules! blake2_impl {
         use digest::InvalidOutputSize;
         use digest::generic_array::GenericArray;
         use digest::generic_array::typenum::{U4, Unsigned};
+        use digest::impl_write;
         use core::cmp;
         use core::ops::Div;
         use byte_tools::{copy, zero};

blake2/src/blake2.rs

@@ -5,10 +5,8 @@
 //! `Blake2b` can be used in the following way:
 //!
 //! ```rust
-//! # #[macro_use] extern crate hex_literal;
-//! # extern crate blake2;
-//! # fn main() {
 //! use blake2::{Blake2b, Blake2s, Digest};
+//! use hex_literal::hex;
 //!
 //! // create a Blake2b object
 //! let mut hasher = Blake2b::new();
@@ -30,7 +28,6 @@
 //! assert_eq!(res[..], hex!("
 //!     9aec6806794561107e594b1f6a8a6b0c92a0cba9acf5e5e93cca06f781813b0b
 //! ")[..]);
-//! # }
 //! ```
 //!
 //! Also see [RustCrypto/hashes](https://github.com/RustCrypto/hashes) readme.
@@ -92,10 +89,6 @@
 
 #[macro_use]
 extern crate opaque_debug;
-#[macro_use]
-pub extern crate digest;
-
-pub use crypto_mac;
 
 #[cfg(feature = "std")]
 extern crate std;
@@ -111,6 +104,8 @@ mod blake2;
 mod blake2b;
 mod blake2s;
 
+pub use crypto_mac;
+pub use digest::{self, Digest};
+
 pub use crate::blake2b::{Blake2b, VarBlake2b};
 pub use crate::blake2s::{Blake2s, VarBlake2s};
-pub use digest::Digest;

blake2/src/lib.rs

@@ -1,8 +1,7 @@
 #![no_std]
-#[macro_use]
-extern crate digest;
 
 use digest::dev::{digest_test, variable_test};
+use digest::new_test;
 
 new_test!(blake2b_fixed, "blake2b/fixed", blake2::Blake2b, digest_test);
 new_test!(

blake2/tests/lib.rs

@@ -1,7 +1,5 @@
-#[macro_use]
-extern crate hex_literal;
-
 use blake2::{Blake2b, Blake2s, Digest};
+use hex_literal::hex;
 
 #[test]
 fn blake2s_persona() {

blake2/tests/persona.rs

@@ -18,7 +18,7 @@ opaque-debug = "0.2"
 
 [dev-dependencies]
 digest = { version = "0.9.0-pre", features = ["dev"] }
-hex-literal = "0.1"
+hex-literal = "0.2"
 
 [features]
 default = ["std"]

gost94/Cargo.toml

@@ -1,5 +1,4 @@
 #![no_std]
 #![feature(test)]
 
-use digest::bench;
-bench!(gost94::Gost94Test);
+digest::bench!(gost94::Gost94Test);

gost94/benches/lib.rs

@@ -5,6 +5,7 @@ use block_buffer::byteorder::{ByteOrder, LE};
 use block_buffer::BlockBuffer;
 use digest::generic_array::typenum::U32;
 use digest::generic_array::GenericArray;
+use digest::impl_write;
 use digest::{BlockInput, FixedOutput, Reset, Update};
 
 pub(crate) type Block = [u8; 32];

gost94/src/gost94.rs

@@ -3,10 +3,8 @@
 //! # Usage
 //!
 //! ```rust
-//! # #[macro_use] extern crate hex_literal;
-//! # extern crate gost94;
-//! # fn main() {
 //! use gost94::{Gost94Test, Digest};
+//! use hex_literal::hex;
 //!
 //! // create a Gost94 hasher instance with test S-box
 //! let mut hasher = Gost94Test::new();
@@ -20,7 +18,6 @@
 //! assert_eq!(result[..], hex!("
 //!     1bb6ce69d2e895a78489c87a0712a2f40258d1fae3a4666c23f8f487bef0e22a
 //! "));
-//! # }
 //! ```
 //!
 //! Also see [RustCrypto/hashes][2] readme.
@@ -32,8 +29,6 @@
 #![doc(html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
 #![warn(missing_docs, rust_2018_idioms)]
 
-#[macro_use]
-pub extern crate digest;
 #[macro_use]
 extern crate opaque_debug;
 #[cfg(feature = "std")]
@@ -47,7 +42,7 @@ mod gost94;
 mod s2015;
 mod test_param;
 
-pub use digest::Digest;
+pub use digest::{self, Digest};
 
 pub use crate::cryptopro::Gost94CryptoPro;
 pub use crate::gost94::Gost94;

gost94/src/lib.rs

@@ -2,6 +2,7 @@ macro_rules! gost94_impl {
     ($state:ident, $sbox:expr) => {
         use digest::generic_array::typenum::U32;
         use digest::generic_array::GenericArray;
+        use digest::impl_write;
         use digest::{BlockInput, FixedOutput, Reset, Update};
         use $crate::gost94::{Block, Gost94, SBox};
 

gost94/src/macros.rs

@@ -1,8 +1,7 @@
 #![no_std]
-#[macro_use]
-extern crate digest;
 
 use digest::dev::{digest_test, one_million_a};
+use digest::new_test;
 
 new_test!(gost94_test_main, "test", gost94::Gost94Test, digest_test);
 new_test!(

gost94/tests/lib.rs

@@ -18,7 +18,7 @@ opaque-debug = "0.2"
 
 [dev-dependencies]
 digest = { version = "0.9.0-pre", features = ["dev"] }
-hex-literal = "0.1"
+hex-literal = "0.2"
 
 [features]
 default = ["std"]

groestl/Cargo.toml

@@ -1,5 +1,4 @@
 #![no_std]
 #![feature(test)]
 
-use digest::bench;
-bench!(groestl::Groestl256);
+digest::bench!(groestl::Groestl256);

groestl/benches/groestl256.rs

@@ -1,5 +1,4 @@
 #![no_std]
 #![feature(test)]
 
-use digest::bench;
-bench!(groestl::Groestl512);
+digest::bench!(groestl::Groestl512);

groestl/benches/groestl512.rs

@@ -10,10 +10,8 @@
 //! you to specify a digest size between 33 and 64 inclusive.
 //!
 //! ```rust
-//! # #[macro_use] extern crate hex_literal;
-//! # extern crate groestl;
-//! # fn main() {
 //! use groestl::{Digest, Groestl256};
+//! use hex_literal::hex;
 //!
 //! // create a Groestl-256 hasher instance
 //! let mut hasher = Groestl256::default();
@@ -27,7 +25,6 @@
 //! assert_eq!(result[..], hex!("
 //!     dc0283ca481efa76b7c19dd5a0b763dff0e867451bd9488a9c59f6c8b8047a86
 //! "));
-//! # }
 //! ```
 //!
 //! Also see [RustCrypto/hashes][2] readme.
@@ -40,19 +37,17 @@
 #![deny(unsafe_code)]
 #![warn(rust_2018_idioms)]
 
-// TODO: import all digest macros via 2018 module syntax
-#[macro_use]
-pub extern crate digest;
-
 #[macro_use]
 extern crate opaque_debug;
 
 #[cfg(feature = "std")]
 extern crate std;
 
+pub use digest::{self, Digest};
+
 use digest::generic_array::typenum::{Unsigned, U128, U28, U32, U48, U64};
 use digest::generic_array::GenericArray;
-pub use digest::Digest;
+use digest::impl_write;
 use digest::InvalidOutputSize;
 use digest::{BlockInput, FixedOutput, Reset, Update, VariableOutput};
 

groestl/src/lib.rs

@@ -12,11 +12,11 @@ keywords = ["crypto", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = "0.9.0-pre"
+digest = "= 0.9.0-pre"
 
 [dev-dependencies]
-digest = { version = "0.9.0-pre", features = ["dev"] }
-hex-literal = "0.1"
+digest = { version = "= 0.9.0-pre", features = ["dev"] }
+hex-literal = "0.2"
 
 [features]
 default = ["std"]

k12/Cargo.toml

@@ -0,0 +1,12 @@
+#![no_std]
+#![feature(test)]
+
+extern crate test;
+
+use digest::Update;
+use test::Bencher;
+
+digest::bench!(bench1_10, k12::KangarooTwelve, 10);
+digest::bench!(bench2_100, k12::KangarooTwelve, 100);
+digest::bench!(bench3_1000, k12::KangarooTwelve, 1000);
+digest::bench!(bench4_10000, k12::KangarooTwelve, 10000);