Add rustfmt::skip and small adjustments where needed

Author: tnull

lightning/src/ln/onion_utils.rs

@@ -797,6 +797,7 @@ impl_writeable_tlv_based_enum!(HTLCFailReasonRepr,
 ;);
 
 impl HTLCFailReason {
+	#[rustfmt::skip]
 	pub(super) fn reason(failure_code: u16, data: Vec<u8>) -> Self {
 		const BADONION: u16 = 0x8000;
 		const PERM: u16 = 0x4000;
@@ -1009,11 +1010,14 @@ fn decode_next_hop<T, R: ReadableArgs<T>, N: NextPacketBytes>(shared_secret: [u8
 	match R::read(&mut chacha_stream, read_args) {
 		Err(err) => {
 			let error_code = match err {
-				msgs::DecodeError::UnknownVersion => 0x4000 | 1, // unknown realm byte
+				// Unknown realm byte
+				msgs::DecodeError::UnknownVersion => 0x4000 | 1,
+				// invalid_onion_payload
 				msgs::DecodeError::UnknownRequiredFeature|
 				msgs::DecodeError::InvalidValue|
-				msgs::DecodeError::ShortRead => 0x4000 | 22, // invalid_onion_payload
-				_ => 0x2000 | 2, // Should never happen
+				msgs::DecodeError::ShortRead => 0x4000 | 22,
+				// Should never happen
+				_ => 0x2000 | 2,
 			};
 			return Err(OnionDecodeErr::Relay {
 				err_msg: "Unable to decode our hop data",