From 05cde32d019f3eaea2737ea3a9ce4b07c9d98431 Mon Sep 17 00:00:00 2001
From: Andreas Fackler <AndreasFackler@gmx.de>
Date: Mon, 29 Oct 2018 14:58:06 +0100
Subject: [PATCH] Instead of macro_use, use use.

---
 benches/bench.rs      | 3 +--
 examples/basic_pkc.rs | 2 +-
 src/error.rs          | 2 ++
 src/lib.rs            | 8 +++-----
 src/poly.rs           | 3 ++-
 src/secret.rs         | 2 ++
 src/serde_impl.rs     | 2 ++
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/benches/bench.rs b/benches/bench.rs
index c628b4b..1ffaead 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -1,10 +1,9 @@
-#[macro_use]
 extern crate criterion;
 extern crate pairing;
 extern crate rand;
 extern crate threshold_crypto;
 
-use criterion::Criterion;
+use criterion::{criterion_group, criterion_main, Criterion};
 use threshold_crypto::poly::Poly;
 use threshold_crypto::Fr;
 
diff --git a/examples/basic_pkc.rs b/examples/basic_pkc.rs
index aa26fe3..a8095d7 100644
--- a/examples/basic_pkc.rs
+++ b/examples/basic_pkc.rs
@@ -1,9 +1,9 @@
 extern crate bincode;
-#[macro_use]
 extern crate serde_derive;
 extern crate threshold_crypto;
 
 use bincode::{deserialize, serialize};
+use serde_derive::{Deserialize, Serialize};
 use threshold_crypto::{PublicKey, SecretKey, Signature};
 
 #[derive(Deserialize, Serialize)]
diff --git a/src/error.rs b/src/error.rs
index 3e41566..97a00d2 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,5 +1,7 @@
 //! Crypto errors.
 
+use failure::Fail;
+
 /// A crypto error.
 #[derive(Clone, Eq, PartialEq, Debug, Fail)]
 pub enum Error {
diff --git a/src/lib.rs b/src/lib.rs
index 8ef55d7..2a0eb70 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,20 +15,15 @@
 extern crate bincode;
 extern crate byteorder;
 extern crate errno;
-#[macro_use]
 extern crate failure;
 extern crate hex_fmt;
 extern crate init_with;
-#[macro_use]
 extern crate lazy_static;
-#[macro_use]
 extern crate log;
 extern crate memsec;
 extern crate rand;
-#[macro_use]
 extern crate rand_derive;
 extern crate serde;
-#[macro_use]
 extern crate serde_derive;
 extern crate tiny_keccak;
 
@@ -48,14 +43,17 @@ use std::ptr::copy_nonoverlapping;
 use byteorder::{BigEndian, ByteOrder};
 use hex_fmt::HexFmt;
 use init_with::InitWith;
+use log::debug;
 use pairing::{CurveAffine, CurveProjective, Engine, Field};
 use rand::{ChaChaRng, OsRng, Rand, Rng, SeedableRng};
+use rand_derive::Rand;
 use tiny_keccak::sha3_256;
 
 use error::{Error, Result};
 use into_fr::IntoFr;
 use poly::{Commitment, Poly};
 use secret::{clear_fr, ContainsSecret, MemRange, FR_SIZE};
+use serde_derive::{Deserialize, Serialize};
 
 #[cfg(not(feature = "use-insecure-test-only-mock-crypto"))]
 pub use pairing::bls12_381::{Bls12 as PEngine, Fr, G1Affine, G2Affine, G1, G2};
diff --git a/src/poly.rs b/src/poly.rs
index 84bc77e..ca62bc2 100644
--- a/src/poly.rs
+++ b/src/poly.rs
@@ -22,13 +22,14 @@ use std::hash::{Hash, Hasher};
 use std::mem::size_of_val;
 use std::{cmp, iter, ops};
 
-use super::{Fr, G1Affine, G1};
 use pairing::{CurveAffine, CurveProjective, Field};
 use rand::Rng;
+use serde_derive::{Deserialize, Serialize};
 
 use error::{Error, Result};
 use into_fr::IntoFr;
 use secret::{clear_fr, ContainsSecret, MemRange, Safe};
+use {Fr, G1Affine, G1};
 
 /// A univariate polynomial in the prime field.
 #[derive(Serialize, Deserialize, PartialEq, Eq)]
diff --git a/src/secret.rs b/src/secret.rs
index 02ccafa..3767720 100644
--- a/src/secret.rs
+++ b/src/secret.rs
@@ -4,7 +4,9 @@
 use std::mem::{size_of, size_of_val};
 use std::ops::{Deref, DerefMut};
 
+use lazy_static::lazy_static;
 use memsec::memzero;
+
 use Fr;
 
 lazy_static! {
diff --git a/src/serde_impl.rs b/src/serde_impl.rs
index 6ea1bba..f98745f 100644
--- a/src/serde_impl.rs
+++ b/src/serde_impl.rs
@@ -3,6 +3,7 @@ use std::borrow::Cow;
 use super::G1;
 use serde::de::Error as DeserializeError;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde_derive::{Deserialize, Serialize};
 
 use poly::{coeff_pos, BivarCommitment};
 
@@ -200,6 +201,7 @@ mod tests {
     use bincode;
     use pairing::Engine;
     use rand::{self, Rng};
+    use serde_derive::{Deserialize, Serialize};
 
     use poly::BivarPoly;