From c8e49aa3980a1ad713d805852c5c17f27d20835e Mon Sep 17 00:00:00 2001 From: Ryan Loomba Date: Thu, 8 Oct 2020 15:46:43 -0700 Subject: [PATCH] trivial changes to fix clippy::write_with_newline warnings --- lightning/src/routing/network_graph.rs | 8 ++++---- lightning/src/util/macro_logger.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs index cafe4fc1..308c0526 100644 --- a/lightning/src/routing/network_graph.rs +++ b/lightning/src/routing/network_graph.rs @@ -518,13 +518,13 @@ impl Readable for NetworkGraph { impl fmt::Display for NetworkGraph { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { - write!(f, "Network map\n[Channels]\n")?; + writeln!(f, "Network map\n[Channels]")?; for (key, val) in self.channels.iter() { - write!(f, " {}: {}\n", key, val)?; + writeln!(f, " {}: {}", key, val)?; } - write!(f, "[Nodes]\n")?; + writeln!(f, "[Nodes]")?; for (key, val) in self.nodes.iter() { - write!(f, " {}: {}\n", log_pubkey!(key), val)?; + writeln!(f, " {}: {}", log_pubkey!(key), val)?; } Ok(()) } diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs index c2c5122d..e667c4d7 100644 --- a/lightning/src/util/macro_logger.rs +++ b/lightning/src/util/macro_logger.rs @@ -80,9 +80,9 @@ pub(crate) struct DebugRoute<'a>(pub &'a Route); impl<'a> std::fmt::Display for DebugRoute<'a> { fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { for (idx, p) in self.0.paths.iter().enumerate() { - write!(f, "path {}:\n", idx)?; + writeln!(f, "path {}:", idx)?; for h in p.iter() { - write!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}\n", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?; + writeln!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?; } } Ok(()) -- 2.30.2