ChannelManager+Router++ Logger Arc --> Deref

[rust-lightning] / lightning / src / util / macro_logger.rs

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index bea3685b546728024bf1da7695dc9f495dcf23ff..5a6002d8594201f8d0a30b0c32dde75d0d03fc1f 100644 (file)
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -147,42 +147,42 @@ macro_rules! log_spendable {
 }
 
 macro_rules! log_internal {
-       ($self: ident, $lvl:expr, $($arg:tt)+) => (
-               &$self.logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+       ($logger: expr, $lvl:expr, $($arg:tt)+) => (
+               $logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
        );
 }
 
 macro_rules! log_error {
-       ($self: ident, $($arg:tt)*) => (
+       ($logger: expr, $($arg:tt)*) => (
                #[cfg(not(any(feature = "max_level_off")))]
-               log_internal!($self, $crate::util::logger::Level::Error, $($arg)*);
+               log_internal!($logger, $crate::util::logger::Level::Error, $($arg)*);
        )
 }
 
 macro_rules! log_warn {
-       ($self: ident, $($arg:tt)*) => (
+       ($logger: expr, $($arg:tt)*) => (
                #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
-               log_internal!($self, $crate::util::logger::Level::Warn, $($arg)*);
+               log_internal!($logger, $crate::util::logger::Level::Warn, $($arg)*);
        )
 }
 
 macro_rules! log_info {
-       ($self: ident, $($arg:tt)*) => (
+       ($logger: expr, $($arg:tt)*) => (
                #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
-               log_internal!($self, $crate::util::logger::Level::Info, $($arg)*);
+               log_internal!($logger, $crate::util::logger::Level::Info, $($arg)*);
        )
 }
 
 macro_rules! log_debug {
-       ($self: ident, $($arg:tt)*) => (
+       ($logger: expr, $($arg:tt)*) => (
                #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
-               log_internal!($self, $crate::util::logger::Level::Debug, $($arg)*);
+               log_internal!($logger, $crate::util::logger::Level::Debug, $($arg)*);
        )
 }
 
 macro_rules! log_trace {
-       ($self: ident, $($arg:tt)*) => (
+       ($logger: expr, $($arg:tt)*) => (
                #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
-               log_internal!($self, $crate::util::logger::Level::Trace, $($arg)*);
+               log_internal!($logger, $crate::util::logger::Level::Trace, $($arg)*);
        )
 }