Deal with 2018 macro-as-item changes

This promised to unify macros and items, but
unfortunately doesn't apply to macros from the current
crate.  Hence, this adds significant mess.

src/anchors.rs

@@ -5,6 +5,8 @@ pub use crate::msgs::handshake::{DistinguishedName, DistinguishedNames};
 use crate::pemfile;
 use crate::x509;
 use crate::key;
+#[cfg(feature = "logging")]
+use crate::log::{debug, trace};
 use std::io;
 
 /// This is like a `webpki::TrustAnchor`, except it owns

src/client/common.rs

@@ -10,6 +10,8 @@ use crate::msgs::enums::NamedGroup;
 use crate::session::SessionRandoms;
 use crate::sign;
 use crate::suites;
+#[cfg(feature = "logging")]
+use crate::log::trace;
 use webpki;
 
 use std::mem;

src/client/hs.rs

@@ -28,6 +28,8 @@ use crate::hash_hs;
 use crate::verify;
 use crate::rand;
 use crate::ticketer;
+#[cfg(feature = "logging")]
+use crate::log::{debug, trace, warn};
 use crate::error::TLSError;
 use crate::handshake::{check_message, check_handshake_message};
 #[cfg(feature = "quic")]

src/client/mod.rs

@@ -14,6 +14,8 @@ use crate::sign;
 use crate::error::TLSError;
 use crate::key;
 use crate::vecbuf::WriteV;
+#[cfg(feature = "logging")]
+use crate::log::trace;
 
 use std::sync::Arc;
 use std::io;

src/handshake.rs

@@ -1,6 +1,8 @@
 use crate::msgs::enums::{ContentType, HandshakeType};
 use crate::msgs::message::{Message, MessagePayload};
 use crate::error::TLSError;
+#[cfg(feature = "logging")]
+use crate::log::warn;
 
 pub fn check_handshake_message(m: &Message,
                                handshake_types: &[HandshakeType]) -> Result<(), TLSError> {

src/hash_hs.rs

@@ -3,6 +3,8 @@ use std::mem;
 use crate::msgs::codec::Codec;
 use crate::msgs::message::{Message, MessagePayload};
 use crate::msgs::handshake::HandshakeMessagePayload;
+#[cfg(feature = "logging")]
+use crate::log::warn;
 
 /// This deals with keeping a running hash of the handshake
 /// payloads.  This is computed by buffering initially.  Once

src/keylog.rs

@@ -5,6 +5,9 @@ use std::io;
 use std::io::Write;
 use std::sync::Mutex;
 
+#[cfg(feature = "logging")]
+use crate::log::warn;
+
 /// This trait represents the ability to do something useful
 /// with key material, such as logging it to a file for debugging.
 ///

src/lib.rs

@@ -210,7 +210,6 @@ use log;
 mod log {
     macro_rules! trace    ( ($($tt:tt)*) => {{}} );
     macro_rules! debug    ( ($($tt:tt)*) => {{}} );
-    macro_rules! info     ( ($($tt:tt)*) => {{}} );
     macro_rules! warn     ( ($($tt:tt)*) => {{}} );
     macro_rules! error    ( ($($tt:tt)*) => {{}} );
 }

src/msgs/handshake.rs

@@ -8,11 +8,15 @@ use crate::msgs::enums::PSKKeyExchangeMode;
 use crate::msgs::base::{Payload, PayloadU8, PayloadU16, PayloadU24};
 use crate::msgs::codec;
 use crate::msgs::codec::{Codec, Reader};
+use crate::key;
+
+#[cfg(feature = "logging")]
+use crate::log::warn;
+
 use std::fmt;
 use std::io::Write;
 use std::collections;
 use std::mem;
-use crate::key;
 use untrusted;
 use webpki;
 

src/server/hs.rs

@@ -30,6 +30,8 @@ use crate::verify;
 use crate::util;
 use crate::rand;
 use crate::sign;
+#[cfg(feature = "logging")]
+use crate::log::{warn, trace, debug};
 use crate::error::TLSError;
 use crate::handshake::{check_handshake_message, check_message};
 use webpki;

src/server/mod.rs

@@ -10,6 +10,8 @@ use crate::sign;
 use crate::verify;
 use crate::key;
 use crate::vecbuf::WriteV;
+#[cfg(feature = "logging")]
+use crate::log::trace;
 
 use webpki;
 

src/session.rs

@@ -18,6 +18,8 @@ use crate::prf;
 use crate::rand;
 use crate::quic;
 use crate::hash_hs;
+#[cfg(feature = "logging")]
+use crate::log::{warn, debug, error};
 
 use std::io;
 use std::collections::VecDeque;

src/verify.rs

@@ -10,6 +10,8 @@ use crate::msgs::handshake::SCTList;
 use crate::msgs::enums::SignatureScheme;
 use crate::error::TLSError;
 use crate::anchors::{DistinguishedNames, RootCertStore};
+#[cfg(feature = "logging")]
+use crate::log::{warn, debug};
 
 type SignatureAlgorithms = &'static [&'static webpki::SignatureAlgorithm];