projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove trailing ;s from macro calls to silence new rustc warnings
[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 3ac294fbff9097686d4d28df669bcab76c402f5e..7477526133e7b99394e699e7193dda3c7a21bbba 100644
(file)
--- a/
lightning/src/util/macro_logger.rs
+++ b/
lightning/src/util/macro_logger.rs
@@
-16,6
+16,7
@@
use bitcoin::secp256k1::key::PublicKey;
use routing::router::Route;
use ln::chan_utils::HTLCType;
use routing::router::Route;
use ln::chan_utils::HTLCType;
+use util::logger::DebugBytes;
pub(crate) struct DebugPubKey<'a>(pub &'a PublicKey);
impl<'a> core::fmt::Display for DebugPubKey<'a> {
pub(crate) struct DebugPubKey<'a>(pub &'a PublicKey);
impl<'a> core::fmt::Display for DebugPubKey<'a> {
@@
-32,18
+33,11
@@
macro_rules! log_pubkey {
}
}
}
}
-pub(crate) struct DebugBytes<'a>(pub &'a [u8]);
-impl<'a> core::fmt::Display for DebugBytes<'a> {
- fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
- for i in self.0 {
- write!(f, "{:02x}", i)?;
- }
- Ok(())
- }
-}
+/// Logs a byte slice in hex format.
+#[macro_export]
macro_rules! log_bytes {
($obj: expr) => {
macro_rules! log_bytes {
($obj: expr) => {
-
::util::macro_
logger::DebugBytes(&$obj)
+
$crate::util::
logger::DebugBytes(&$obj)
}
}
}
}
@@
-142,7
+136,7
@@
impl<'a> core::fmt::Display for DebugSpendable<'a> {
write!(f, "DelayedPaymentOutput {}:{} marked for spending", descriptor.outpoint.txid, descriptor.outpoint.index)?;
}
&SpendableOutputDescriptor::StaticPaymentOutput(ref descriptor) => {
write!(f, "DelayedPaymentOutput {}:{} marked for spending", descriptor.outpoint.txid, descriptor.outpoint.index)?;
}
&SpendableOutputDescriptor::StaticPaymentOutput(ref descriptor) => {
- write!(f, "
DynamicOutputP2WPKH
{}:{} marked for spending", descriptor.outpoint.txid, descriptor.outpoint.index)?;
+ write!(f, "
StaticPaymentOutput
{}:{} marked for spending", descriptor.outpoint.txid, descriptor.outpoint.index)?;
}
}
Ok(())
}
}
Ok(())
@@
-157,10
+151,11
@@
macro_rules! log_spendable {
/// Create a new Record and log it. You probably don't want to use this macro directly,
/// but it needs to be exported so `log_trace` etc can use it in external crates.
/// Create a new Record and log it. You probably don't want to use this macro directly,
/// but it needs to be exported so `log_trace` etc can use it in external crates.
+#[doc(hidden)]
#[macro_export]
macro_rules! log_internal {
($logger: expr, $lvl:expr, $($arg:tt)+) => (
#[macro_export]
macro_rules! log_internal {
($logger: expr, $lvl:expr, $($arg:tt)+) => (
- $logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()))
;
+ $logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()))
);
}
);
}
@@
-218,6
+213,6
@@
macro_rules! log_debug {
#[macro_export]
macro_rules! log_trace {
($logger: expr, $($arg:tt)*) => (
#[macro_export]
macro_rules! log_trace {
($logger: expr, $($arg:tt)*) => (
- log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
;
+ log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
)
}
)
}