From d5f11159d82c9e50fd7deb5b48611f5e00553374 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Fri, 22 Dec 2017 09:50:26 +0000
Subject: [PATCH] Make the log crate properly optional.

---
 .test_like_travis.rb | 1 +
 examples/stress.rs   | 1 +
 src/lib.rs           | 3 +--
 src/socket/tcp.rs    | 8 +++++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.test_like_travis.rb b/.test_like_travis.rb
index 69bc0318..7d3199b6 100755
--- a/.test_like_travis.rb
+++ b/.test_like_travis.rb
@@ -11,5 +11,6 @@ travis_config['matrix']['include'].each do |env|
   travis_config['script'].each do |cmd|
     $stderr.puts('+ ' + cmd.gsub(/\$(\w+)/) { ENV[$1] })
     system(cmd)
+    $?.success? or exit 1
   end
 end
diff --git a/examples/stress.rs b/examples/stress.rs
index 66cf2ab9..b88811cb 100644
--- a/examples/stress.rs
+++ b/examples/stress.rs
@@ -1,4 +1,5 @@
 #[cfg(feature = "log")]
+#[macro_use]
 extern crate log;
 #[cfg(feature = "log")]
 extern crate env_logger;
diff --git a/src/lib.rs b/src/lib.rs
index 82276041..90f980d5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -83,8 +83,7 @@ extern crate std;
 extern crate libc;
 #[cfg(feature = "alloc")]
 extern crate alloc;
-#[cfg(any(test, feature = "log"))]
-#[allow(unused_imports)]
+#[cfg(feature = "log")]
 #[macro_use(log, trace, debug)]
 extern crate log;
 
diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
index 5b4b4c38..8827e046 100644
--- a/src/socket/tcp.rs
+++ b/src/socket/tcp.rs
@@ -1555,12 +1555,12 @@ mod test {
             payload_len: repr.buffer_len(),
             hop_limit:   64
         };
-        trace!("send: {}", repr);
+        net_trace!("send: {}", repr);
 
         assert!(socket.accepts(&ip_repr, repr));
         match socket.process(timestamp, &ip_repr, repr) {
             Ok(Some((_ip_repr, repr))) => {
-                trace!("recv: {}", repr);
+                net_trace!("recv: {}", repr);
                 Ok(Some(repr))
             }
             Ok(None) => Ok(None),
@@ -1580,7 +1580,7 @@ mod test {
             assert_eq!(ip_repr.dst_addr(), REMOTE_IP);
             assert_eq!(ip_repr.payload_len(), tcp_repr.buffer_len());
 
-            trace!("recv: {}", tcp_repr);
+            net_trace!("recv: {}", tcp_repr);
             Ok(f(Ok(tcp_repr)))
         });
         match result {
@@ -1637,6 +1637,7 @@ mod test {
         })
     }
 
+    #[cfg(feature = "log")]
     fn init_logger() {
         extern crate log;
         use std::boxed::Box;
@@ -1662,6 +1663,7 @@ mod test {
     }
 
     fn socket() -> TcpSocket<'static> {
+        #[cfg(feature = "log")]
         init_logger();
 
         let rx_buffer = SocketBuffer::new(vec![0; 64]);