reorder string utils

Author: Evanfeenstra

lightning/src/util/string.rs

@@ -15,6 +15,29 @@ use crate::io::{self, Read};
 use crate::ln::msgs;
 use crate::util::ser::{Writeable, Writer, Readable};
 
+/// Struct to `Display` fields in a safe way using `PrintableString`
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct SanitizedString(pub String);
+
+impl Writeable for SanitizedString {
+	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
+		self.0.write(w)
+	}
+}
+
+impl Readable for SanitizedString {
+	fn read<R: Read>(r: &mut R) -> Result<Self, msgs::DecodeError> {
+		let s: String = Readable::read(r)?;
+		Ok(Self(s))
+	}
+}
+
+impl fmt::Display for SanitizedString {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		PrintableString(&self.0).fmt(f)
+	}
+}
+
 /// A string that displays only printable characters, replacing control characters with
 /// [`core::char::REPLACEMENT_CHARACTER`].
 #[derive(Debug, PartialEq)]
@@ -44,26 +67,3 @@ mod tests {
 		);
 	}
 }
-
-/// Struct to `Display` fields in a safe way using `PrintableString`
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct SanitizedString(pub String);
-
-impl Writeable for SanitizedString {
-	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-		self.0.write(w)
-	}
-}
-
-impl Readable for SanitizedString {
-	fn read<R: Read>(r: &mut R) -> Result<Self, msgs::DecodeError> {
-		let s: String = Readable::read(r)?;
-		Ok(Self(s))
-	}
-}
-
-impl fmt::Display for SanitizedString {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		PrintableString(&self.0).fmt(f)
-	}
-}