Fix situations where rustfmt broke custom readability.

Author: valentinewallace

fuzz/src/full_stack.rs

@@ -41,24 +41,27 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicU64,AtomicUsize,Ordering};
 
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be16(v: &[u8]) -> u16 {
-	((v[0] as u16) << 8*1) |
-	((v[1] as u16) << 8*0)
+	((v[0] as u16) << 8 * 1) |
+	((v[1] as u16) << 8 * 0)
 }
 
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be24(v: &[u8]) -> u32 {
-	((v[0] as u32) << 8*2) |
-	((v[1] as u32) << 8*1) |
-	((v[2] as u32) << 8*0)
+	((v[0] as u32) << 8 * 2) |
+	((v[1] as u32) << 8 * 1) |
+	((v[2] as u32) << 8 * 0)
 }
 
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be32(v: &[u8]) -> u32 {
-	((v[0] as u32) << 8*3) |
-	((v[1] as u32) << 8*2) |
-	((v[2] as u32) << 8*1) |
-	((v[3] as u32) << 8*0)
+	((v[0] as u32) << 8 * 3) |
+	((v[1] as u32) << 8 * 2) |
+	((v[2] as u32) << 8 * 1) |
+	((v[3] as u32) << 8 * 0)
 }
 
 #[inline]
@@ -282,6 +285,7 @@ impl KeysInterface for KeyProvider {
 		[0; 32])
 	}
 
+	#[cfg_attr(rustfmt, rustfmt_skip)]
 	fn get_channel_id(&self) -> [u8; 32] {
 		let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 		[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

fuzz/src/peer_crypt.rs

@@ -5,6 +5,7 @@ use bitcoin::secp256k1::key::{PublicKey,SecretKey};
 use utils::test_logger;
 
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 fn slice_to_be16(v: &[u8]) -> u16 {
 	((v[0] as u16) << 8*1) |
 	((v[1] as u16) << 8*0)

fuzz/src/router.rs

@@ -20,29 +20,32 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be16(v: &[u8]) -> u16 {
-	((v[0] as u16) << 8*1) |
-	((v[1] as u16) << 8*0)
+	((v[0] as u16) << 8 * 1) |
+	((v[1] as u16) << 8 * 0)
 }
 
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be32(v: &[u8]) -> u32 {
-	((v[0] as u32) << 8*3) |
-	((v[1] as u32) << 8*2) |
-	((v[2] as u32) << 8*1) |
-	((v[3] as u32) << 8*0)
+	((v[0] as u32) << 8 * 3) |
+	((v[1] as u32) << 8 * 2) |
+	((v[2] as u32) << 8 * 1) |
+	((v[3] as u32) << 8 * 0)
 }
 
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be64(v: &[u8]) -> u64 {
-	((v[0] as u64) << 8*7) |
-	((v[1] as u64) << 8*6) |
-	((v[2] as u64) << 8*5) |
-	((v[3] as u64) << 8*4) |
-	((v[4] as u64) << 8*3) |
-	((v[5] as u64) << 8*2) |
-	((v[6] as u64) << 8*1) |
-	((v[7] as u64) << 8*0)
+	((v[0] as u64) << 8 * 7) |
+	((v[1] as u64) << 8 * 6) |
+	((v[2] as u64) << 8 * 5) |
+	((v[3] as u64) << 8 * 4) |
+	((v[4] as u64) << 8 * 3) |
+	((v[5] as u64) << 8 * 2) |
+	((v[6] as u64) << 8 * 1) |
+	((v[7] as u64) << 8 * 0)
 }
 
 

lightning/src/ln/channel.rs

@@ -773,6 +773,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 
 	// Utilities to build transactions:
 
+	#[cfg_attr(rustfmt, rustfmt_skip)]
 	fn get_commitment_transaction_number_obscure_factor(&self) -> u64 {
 		let mut sha = Sha256::engine();
 		let our_payment_basepoint = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.payment_base_key());
@@ -787,12 +788,12 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 		}
 		let res = Sha256::from_engine(sha).into_inner();
 
-		((res[26] as u64) << 5*8) |
-		((res[27] as u64) << 4*8) |
-		((res[28] as u64) << 3*8) |
-		((res[29] as u64) << 2*8) |
-		((res[30] as u64) << 1*8) |
-		((res[31] as u64) << 0*8)
+		((res[26] as u64) << 5 * 8) |
+		((res[27] as u64) << 4 * 8) |
+		((res[28] as u64) << 3 * 8) |
+		((res[29] as u64) << 2 * 8) |
+		((res[30] as u64) << 1 * 8) |
+		((res[31] as u64) << 0 * 8)
 	}
 
 	/// Transaction nomenclature is somewhat confusing here as there are many different cases - a

lightning/src/util/byte_utils.rs

@@ -1,9 +1,12 @@
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be16(v: &[u8]) -> u16 {
 	((v[0] as u16) << 8*1) |
 	((v[1] as u16) << 8*0)
 }
+
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be32(v: &[u8]) -> u32 {
 	((v[0] as u32) << 8*3) |
 	((v[1] as u32) << 8*2) |
@@ -12,13 +15,15 @@ pub fn slice_to_be32(v: &[u8]) -> u32 {
 }
 #[cfg(not(feature = "fuzztarget"))] // Used only by poly1305
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_le32(v: &[u8]) -> u32 {
 	((v[0] as u32) << 8*0) |
 	((v[1] as u32) << 8*1) |
 	((v[2] as u32) << 8*2) |
 	((v[3] as u32) << 8*3)
 }
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be48(v: &[u8]) -> u64 {
 	((v[0] as u64) << 8*5) |
 	((v[1] as u64) << 8*4) |
@@ -28,6 +33,7 @@ pub fn slice_to_be48(v: &[u8]) -> u64 {
 	((v[5] as u64) << 8*0)
 }
 #[inline]
+#[cfg_attr(rustfmt, rustfmt_skip)]
 pub fn slice_to_be64(v: &[u8]) -> u64 {
 	((v[0] as u64) << 8*7) |
 	((v[1] as u64) << 8*6) |

lightning/src/util/poly1305.rs

@@ -40,6 +40,7 @@ impl Poly1305 {
 		poly
 	}
 
+	#[cfg_attr(rustfmt, rustfmt_skip)]
 	fn block(&mut self, m: &[u8]) {
 		let hibit : u32 = if self.finalized { 0 } else { 1 << 24 };
 
@@ -75,7 +76,7 @@ impl Poly1305 {
 		let mut d4 = (h0 as u64 * r4 as u64) + (h1 as u64 * r3 as u64) + (h2 as u64 * r2 as u64) + (h3 as u64 * r1 as u64) + (h4 as u64 * r0 as u64);
 
 		// (partial) h %= p
-		let mut c : u32;
+		let mut c: u32;
 		                c = (d0 >> 26) as u32; h0 = d0 as u32 & 0x3ffffff;
 		d1 += c as u64; c = (d1 >> 26) as u32; h1 = d1 as u32 & 0x3ffffff;
 		d2 += c as u64; c = (d2 >> 26) as u32; h2 = d2 as u32 & 0x3ffffff;
@@ -91,6 +92,7 @@ impl Poly1305 {
 		self.h[4] = h4;
 	}
 
+	#[cfg_attr(rustfmt, rustfmt_skip)]
 	pub fn finish(&mut self) {
 		if self.leftover > 0 {
 			self.buffer[self.leftover] = 1;
@@ -109,7 +111,7 @@ impl Poly1305 {
 		let mut h3 = self.h[3];
 		let mut h4 = self.h[4];
 
-		let mut c : u32;
+		let mut c: u32;
 		             c = h1 >> 26; h1 = h1 & 0x3ffffff;
 		h2 +=     c; c = h2 >> 26; h2 = h2 & 0x3ffffff;
 		h3 +=     c; c = h3 >> 26; h3 = h3 & 0x3ffffff;
@@ -145,8 +147,8 @@ impl Poly1305 {
 		h3 = ((h3 >> 18) | (h4 <<  8)) & 0xffffffff;
 
 		// h = mac = (h + pad) % (2^128)
-		let mut f : u64;
-		f = h0 as u64 + self.pad[0] as u64            ; h0 = f as u32;
+		let mut f: u64;
+		f = h0 as u64 + self.pad[0] as u64;             h0 = f as u32;
 		f = h1 as u64 + self.pad[1] as u64 + (f >> 32); h1 = f as u32;
 		f = h2 as u64 + self.pad[2] as u64 + (f >> 32); h2 = f as u32;
 		f = h3 as u64 + self.pad[3] as u64 + (f >> 32); h3 = f as u32;