fmt peer_msg using write_fmt, use alloc::string::String, some cleanup

Author: Evanfeenstra

lightning/src/util/events.rs

@@ -176,8 +176,7 @@ impl core::fmt::Display for ClosureReason {
 		f.write_str("Channel closed because ")?;
 		match self {
 			ClosureReason::CounterpartyForceClosed { peer_msg } => {
-				f.write_str("counterparty force-closed with message ")?;
-				f.write_str(&format!("{}", peer_msg))
+				f.write_fmt(format_args!("counterparty force-closed with message: {}", peer_msg))
 			},
 			ClosureReason::HolderForceClosed => f.write_str("user manually force-closed the channel"),
 			ClosureReason::CooperativeClosure => f.write_str("the channel was cooperatively closed"),

lightning/src/util/string.rs

@@ -9,10 +9,11 @@
 
 //! Utilities for strings.
 
+use alloc::string::String;
 use core::fmt;
-use crate::util::ser::{Writeable, Writer, Readable};
 use crate::io::{self, Read};
 use crate::ln::msgs;
+use crate::util::ser::{Writeable, Writer, Readable};
 
 /// A string that displays only printable characters, replacing control characters with
 /// [`core::char::REPLACEMENT_CHARACTER`].
@@ -62,7 +63,7 @@ impl Readable for SanitizedString {
 }
 
 impl fmt::Display for SanitizedString {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		PrintableString(&self.0).fmt(f)
-    }
-}
+	}
+}