X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Flogger.rs;h=e48cefaa0443ff9c0a1f731a35fdc73fba57d17b;hb=fb3a86f498f971dc01fdd58b166031793ff1bc1a;hp=92ea8ffed55a91c218c4481e01a83f924536585d;hpb=2b04f193b9dc8eb6d0d0e5b513a47e668324debd;p=rust-lightning

diff --git a/lightning/src/util/logger.rs b/lightning/src/util/logger.rs
index 92ea8ffe..e48cefaa 100644
--- a/lightning/src/util/logger.rs
+++ b/lightning/src/util/logger.rs
@@ -91,10 +91,12 @@ impl Level {
 	}
 }
 
+macro_rules! impl_record {
+	($($args: lifetime)?, $($nonstruct_args: lifetime)?) => {
 /// A Record, unit of logging output with Metadata to enable filtering
 /// Module_path, file, line to inform on log's source
 #[derive(Clone, Debug)]
-pub struct Record<'a> {
+pub struct Record<$($args)?> {
 	/// The verbosity level of the message.
 	pub level: Level,
 	/// The node id of the peer pertaining to the logged record.
@@ -118,22 +120,17 @@ pub struct Record<'a> {
 	pub file: &'static str,
 	/// The line containing the message.
 	pub line: u32,
-
-	#[cfg(c_bindings)]
-	/// We don't actually use the lifetime parameter in C bindings (as there is no good way to
-	/// communicate a lifetime to a C, or worse, Java user).
-	_phantom: core::marker::PhantomData<&'a ()>,
 }
 
-impl<'a> Record<'a> {
+impl<$($args)?> Record<$($args)?> {
 	/// Returns a new Record.
 	///
 	/// This is not exported to bindings users as fmt can't be used in C
 	#[inline]
-	pub fn new(
+	pub fn new<$($nonstruct_args)?>(
 		level: Level, peer_id: Option<PublicKey>, channel_id: Option<ChannelId>,
 		args: fmt::Arguments<'a>, module_path: &'static str, file: &'static str, line: u32
-	) -> Record<'a> {
+	) -> Record<$($args)?> {
 		Record {
 			level,
 			peer_id,
@@ -145,11 +142,14 @@ impl<'a> Record<'a> {
 			module_path,
 			file,
 			line,
-			#[cfg(c_bindings)]
-			_phantom: core::marker::PhantomData,
 		}
 	}
 }
+} }
+#[cfg(not(c_bindings))]
+impl_record!('a, );
+#[cfg(c_bindings)]
+impl_record!(, 'a);
 
 /// A trait encapsulating the operations required of a logger.
 pub trait Logger {
@@ -158,6 +158,9 @@ pub trait Logger {
 }
 
 /// Adds relevant context to a [`Record`] before passing it to the wrapped [`Logger`].
+///
+/// This is not exported to bindings users as lifetimes are problematic and there's little reason
+/// for this to be used downstream anyway.
 pub struct WithContext<'a, L: Deref> where L::Target: Logger {
 	/// The logger to delegate to after adding context to the record.
 	logger: &'a L,