From: Matt Corallo <git@bluematt.me>
Date: Mon, 20 Aug 2018 16:56:17 +0000 (-0400)
Subject: Remove implicit Record import requirement in logging macros
X-Git-Tag: v0.0.12~346^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=42086c94a0f7042379d83ff1c2dcb7a84604b9ae;p=rust-lightning

Remove implicit Record import requirement in logging macros
---

diff --git a/src/ln/channel.rs b/src/ln/channel.rs
index b2164696f..c7c3208e7 100644
--- a/src/ln/channel.rs
+++ b/src/ln/channel.rs
@@ -23,7 +23,7 @@ use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
 use chain::transaction::OutPoint;
 use util::{transaction_utils,rng};
 use util::sha2::Sha256;
-use util::logger::{Logger, Record};
+use util::logger::Logger;
 use util::errors::APIError;
 
 use std;
diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index 03cad49ea..d273be52b 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -20,7 +20,7 @@ use ln::msgs::{HandleError,ChannelMessageHandler,MsgEncodable,MsgDecodable};
 use util::{byte_utils, events, internal_traits, rng};
 use util::sha2::Sha256;
 use util::chacha20poly1305rfc::ChaCha20;
-use util::logger::{Logger, Record};
+use util::logger::Logger;
 use util::errors::APIError;
 
 use crypto;
diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index b44ddc515..11064bf98 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -5,7 +5,7 @@ use ln::msgs::{MsgEncodable,MsgDecodable};
 use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
 use util::byte_utils;
 use util::events::{EventsProvider,Event};
-use util::logger::{Logger, Record};
+use util::logger::Logger;
 
 use std::collections::{HashMap,LinkedList};
 use std::sync::{Arc, Mutex};
diff --git a/src/util/logger.rs b/src/util/logger.rs
index bccc8cd21..720bccf41 100644
--- a/src/util/logger.rs
+++ b/src/util/logger.rs
@@ -126,7 +126,7 @@ pub trait Logger: Sync + Send {
 
 #[cfg(test)]
 mod tests {
-	use util::logger::{Logger, Level, Record};
+	use util::logger::{Logger, Level};
 	use util::test_utils::TestLogger;
 	use std::sync::{Arc};
 
diff --git a/src/util/macro_logger.rs b/src/util/macro_logger.rs
index fd9a61b39..19f0294f9 100644
--- a/src/util/macro_logger.rs
+++ b/src/util/macro_logger.rs
@@ -52,7 +52,7 @@ macro_rules! log_funding_channel_id {
 
 macro_rules! log_internal {
 	($self: ident, $lvl:expr, $($arg:tt)+) => (
-		&$self.logger.log(&Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+		&$self.logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
 	);
 }