Terminate log macro calls used as expressions

src/event.rs

@@ -806,14 +806,14 @@ where
 									self.logger,
 									"Failed to process funding transaction as channel went away before we could fund it: {}",
 									err
-								)
+								);
 							},
 							Err(err) => {
 								log_error!(
 									self.logger,
 									"Failed to process funding transaction: {:?}",
 									err
-								)
+								);
 							},
 						}
 					},
@@ -1577,7 +1577,7 @@ where
 								"Channel request rejected".to_string(),
 							)
 							.unwrap_or_else(|e| {
-								log_error!(self.logger, "Failed to reject channel: {:?}", e)
+								log_error!(self.logger, "Failed to reject channel: {:?}", e);
 							});
 						return Ok(());
 					}
@@ -1613,7 +1613,7 @@ where
 								"Channel request rejected".to_string(),
 							)
 							.unwrap_or_else(|e| {
-								log_error!(self.logger, "Failed to reject channel: {:?}", e)
+								log_error!(self.logger, "Failed to reject channel: {:?}", e);
 							});
 						return Ok(());
 					}
@@ -2210,7 +2210,9 @@ where
 						},
 					}
 				},
-				Err(()) => log_error!(self.logger, "Failed signing funding transaction"),
+				Err(()) => {
+					log_error!(self.logger, "Failed signing funding transaction");
+				},
 			},
 			LdkEvent::SpliceNegotiated {
 				channel_id,

src/lib.rs

@@ -415,7 +415,7 @@ impl Node {
 										gossip_sync_logger,
 										"Background sync of RGS gossip data failed: {}",
 										e
-									)
+									);
 								}
 							}
 						}
@@ -1336,7 +1336,7 @@ impl Node {
 		match self.runtime.block_on(self.peer_store.remove_peer(&counterparty_node_id)) {
 			Ok(()) => {},
 			Err(e) => {
-				log_error!(self.logger, "Failed to remove peer {}: {}", counterparty_node_id, e)
+				log_error!(self.logger, "Failed to remove peer {}: {}", counterparty_node_id, e);
 			},
 		}
 
@@ -2604,9 +2604,11 @@ async fn connect_and_discover_lsp(
 	}
 	match liquidity_source.discover_lsp_protocols(&node_id).await {
 		Ok(protocols) => {
-			log_info!(logger, "Discovered protocols for LSP {}: {:?}", node_id, protocols)
+			log_info!(logger, "Discovered protocols for LSP {}: {:?}", node_id, protocols);
+		},
+		Err(e) => {
+			log_debug!(logger, "Protocol discovery failed for LSP {}: {:?}", node_id, e);
 		},
-		Err(e) => log_debug!(logger, "Protocol discovery failed for LSP {}: {:?}", node_id, e),
 	}
 }
 

src/liquidity/client/lsps2.rs

@@ -234,10 +234,10 @@ where
 			match join_result {
 				Ok((lsp, Ok(fees))) => all_offers.push((lsp, fees)),
 				Ok((lsp, Err(e))) => {
-					log_warn!(self.logger, "Failed to get fees from LSP {}: {}", lsp.node_id, e)
+					log_warn!(self.logger, "Failed to get fees from LSP {}: {}", lsp.node_id, e);
 				},
 				Err(e) => {
-					log_warn!(self.logger, "Failed to get fees from LSP: {}", e)
+					log_warn!(self.logger, "Failed to get fees from LSP: {}", e);
 				},
 			}
 		}

src/payment/forwarding_store.rs

@@ -542,7 +542,7 @@ async fn aggregate_forwarded_payments_and_log(
 			);
 		},
 		Err(e) => {
-			log_error!(forwarding_store.logger, "Forwarded payment aggregation failed: {}", e)
+			log_error!(forwarding_store.logger, "Forwarded payment aggregation failed: {}", e);
 		},
 		_ => {},
 	}
@@ -556,11 +556,13 @@ pub(crate) async fn run_forwarded_payment_aggregation(
 		match forwarding_store.details.is_empty().await {
 			Ok(true) => return,
 			Ok(false) => {},
-			Err(e) => log_error!(
-				forwarding_store.logger,
-				"Failed to check forwarded payment store: {}",
-				e
-			),
+			Err(e) => {
+				log_error!(
+					forwarding_store.logger,
+					"Failed to check forwarded payment store: {}",
+					e
+				);
+			},
 		}
 	}
 
@@ -570,11 +572,13 @@ pub(crate) async fn run_forwarded_payment_aggregation(
 		match forwarding_store.details.is_empty().await {
 			Ok(true) => return,
 			Ok(false) => {},
-			Err(e) => log_error!(
-				forwarding_store.logger,
-				"Failed to check forwarded payment store: {}",
-				e
-			),
+			Err(e) => {
+				log_error!(
+					forwarding_store.logger,
+					"Failed to check forwarded payment store: {}",
+					e
+				);
+			},
 		}
 	}
 
@@ -597,7 +601,7 @@ pub(crate) async fn run_forwarded_payment_aggregation(
 					match forwarding_store.details.is_empty().await {
 						Ok(true) => break,
 						Ok(false) => {},
-						Err(e) => log_error!(forwarding_store.logger, "Failed to check forwarded payment store: {}", e),
+						Err(e) => { log_error!(forwarding_store.logger, "Failed to check forwarded payment store: {}", e); },
 					}
 				}
 			}

src/payment/unified.rs

@@ -402,7 +402,7 @@ impl UnifiedPayment {
 	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
 	pub fn set_test_offer(&self, offer: Offer) {
 		let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
-			log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
+			log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e);
 		});
 	}
 }

src/runtime.rs

@@ -249,7 +249,9 @@ impl Runtime {
 
 			match timeout_res {
 				Ok(stop_res) => match stop_res {
-					Ok(()) => log_debug!(self.logger, "Stopped background processing of events."),
+					Ok(()) => {
+						log_debug!(self.logger, "Stopped background processing of events.");
+					},
 					Err(e) => {
 						abort_handle.abort();
 						log_error!(