Skip to content

Commit 8e9f5ed

Browse files
valentinewallacevalentinewallace
committed
Fix situations where rustfmt broke custom readability.
1 parent 715914d commit 8e9f5ed

File tree

5 files changed

+121
-157
lines changed

5 files changed

+121
-157
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,27 @@ use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
5050
use std::sync::Arc;
5151

5252
#[inline]
53+
#[rustfmt::skip]
5354
pub fn slice_to_be16(v: &[u8]) -> u16 {
54-
((v[0] as u16) << 8 * 1) | ((v[1] as u16) << 8 * 0)
55+
((v[0] as u16) << 8 * 1) |
56+
((v[1] as u16) << 8 * 0)
5557
}
5658

5759
#[inline]
60+
#[rustfmt::skip]
5861
pub fn slice_to_be24(v: &[u8]) -> u32 {
59-
((v[0] as u32) << 8 * 2)
60-
| ((v[1] as u32) << 8 * 1)
61-
| ((v[2] as u32) << 8 * 0)
62+
((v[0] as u32) << 8 * 2) |
63+
((v[1] as u32) << 8 * 1) |
64+
((v[2] as u32) << 8 * 0)
6265
}
6366

6467
#[inline]
68+
#[rustfmt::skip]
6569
pub fn slice_to_be32(v: &[u8]) -> u32 {
66-
((v[0] as u32) << 8 * 3)
67-
| ((v[1] as u32) << 8 * 2)
68-
| ((v[2] as u32) << 8 * 1)
69-
| ((v[3] as u32) << 8 * 0)
70+
((v[0] as u32) << 8 * 3) |
71+
((v[1] as u32) << 8 * 2) |
72+
((v[2] as u32) << 8 * 1) |
73+
((v[3] as u32) << 8 * 0)
7074
}
7175

7276
#[inline]

‎fuzz/src/router.rs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,31 @@ use std::sync::atomic::{AtomicUsize, Ordering};
1919
use std::sync::Arc;
2020

2121
#[inline]
22+
#[rustfmt::skip]
2223
pub fn slice_to_be16(v: &[u8]) -> u16 {
2324
((v[0] as u16) << 8 * 1) | ((v[1] as u16) << 8 * 0)
2425
}
2526

2627
#[inline]
28+
#[rustfmt::skip]
2729
pub fn slice_to_be32(v: &[u8]) -> u32 {
28-
((v[0] as u32) << 8 * 3)
29-
| ((v[1] as u32) << 8 * 2)
30-
| ((v[2] as u32) << 8 * 1)
31-
| ((v[3] as u32) << 8 * 0)
30+
((v[0] as u32) << 8 * 3) |
31+
((v[1] as u32) << 8 * 2) |
32+
((v[2] as u32) << 8 * 1) |
33+
((v[3] as u32) << 8 * 0)
3234
}
3335

3436
#[inline]
37+
#[rustfmt::skip]
3538
pub fn slice_to_be64(v: &[u8]) -> u64 {
36-
((v[0] as u64) << 8 * 7)
37-
| ((v[1] as u64) << 8 * 6)
38-
| ((v[2] as u64) << 8 * 5)
39-
| ((v[3] as u64) << 8 * 4)
40-
| ((v[4] as u64) << 8 * 3)
41-
| ((v[5] as u64) << 8 * 2)
42-
| ((v[6] as u64) << 8 * 1)
43-
| ((v[7] as u64) << 8 * 0)
39+
((v[0] as u64) << 8 * 7) |
40+
((v[1] as u64) << 8 * 6) |
41+
((v[2] as u64) << 8 * 5) |
42+
((v[3] as u64) << 8 * 4) |
43+
((v[4] as u64) << 8 * 3) |
44+
((v[5] as u64) << 8 * 2) |
45+
((v[6] as u64) << 8 * 1) |
46+
((v[7] as u64) << 8 * 0)
4447
}
4548

4649
struct InputData {

‎lightning/src/ln/channel.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
964964

965965
// Utilities to build transactions:
966966

967+
#[rustfmt::skip]
967968
fn get_commitment_transaction_number_obscure_factor(&self) -> u64 {
968969
let mut sha = Sha256::engine();
969970
let our_payment_basepoint = PublicKey::from_secret_key(
@@ -980,12 +981,12 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
980981
}
981982
let res = Sha256::from_engine(sha).into_inner();
982983

983-
((res[26] as u64) << 5 * 8)
984-
| ((res[27] as u64) << 4 * 8)
985-
| ((res[28] as u64) << 3 * 8)
986-
| ((res[29] as u64) << 2 * 8)
987-
| ((res[30] as u64) << 1 * 8)
988-
| ((res[31] as u64) << 0 * 8)
984+
((res[26] as u64) << 5 * 8) |
985+
((res[27] as u64) << 4 * 8) |
986+
((res[28] as u64) << 3 * 8) |
987+
((res[29] as u64) << 2 * 8) |
988+
((res[30] as u64) << 1 * 8) |
989+
((res[31] as u64) << 0 * 8)
989990
}
990991

991992
/// Transaction nomenclature is somewhat confusing here as there are many different cases - a

‎lightning/src/util/byte_utils.rs

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,111 @@
11
#[inline]
2+
#[rustfmt::skip]
23
pub fn slice_to_be16(v: &[u8]) -> u16 {
3-
((v[0] as u16) << 8 * 1) | ((v[1] as u16) << 8 * 0)
4+
((v[0] as u16) << 8*1) |
5+
((v[1] as u16) << 8*0)
46
}
57
#[inline]
8+
#[rustfmt::skip]
69
pub fn slice_to_be32(v: &[u8]) -> u32 {
7-
((v[0] as u32) << 8 * 3)
8-
| ((v[1] as u32) << 8 * 2)
9-
| ((v[2] as u32) << 8 * 1)
10-
| ((v[3] as u32) << 8 * 0)
10+
((v[0] as u32) << 8*3) |
11+
((v[1] as u32) << 8*2) |
12+
((v[2] as u32) << 8*1) |
13+
((v[3] as u32) << 8*0)
1114
}
1215
#[cfg(not(feature = "fuzztarget"))] // Used only by poly1305
1316
#[inline]
17+
#[rustfmt::skip]
1418
pub fn slice_to_le32(v: &[u8]) -> u32 {
15-
((v[0] as u32) << 8 * 0)
16-
| ((v[1] as u32) << 8 * 1)
17-
| ((v[2] as u32) << 8 * 2)
18-
| ((v[3] as u32) << 8 * 3)
19+
((v[0] as u32) << 8*0) |
20+
((v[1] as u32) << 8*1) |
21+
((v[2] as u32) << 8*2) |
22+
((v[3] as u32) << 8*3)
1923
}
2024
#[inline]
25+
#[rustfmt::skip]
2126
pub fn slice_to_be48(v: &[u8]) -> u64 {
22-
((v[0] as u64) << 8 * 5)
23-
| ((v[1] as u64) << 8 * 4)
24-
| ((v[2] as u64) << 8 * 3)
25-
| ((v[3] as u64) << 8 * 2)
26-
| ((v[4] as u64) << 8 * 1)
27-
| ((v[5] as u64) << 8 * 0)
27+
((v[0] as u64) << 8*5) |
28+
((v[1] as u64) << 8*4) |
29+
((v[2] as u64) << 8*3) |
30+
((v[3] as u64) << 8*2) |
31+
((v[4] as u64) << 8*1) |
32+
((v[5] as u64) << 8*0)
2833
}
2934
#[inline]
35+
#[rustfmt::skip]
3036
pub fn slice_to_be64(v: &[u8]) -> u64 {
31-
((v[0] as u64) << 8 * 7)
32-
| ((v[1] as u64) << 8 * 6)
33-
| ((v[2] as u64) << 8 * 5)
34-
| ((v[3] as u64) << 8 * 4)
35-
| ((v[4] as u64) << 8 * 3)
36-
| ((v[5] as u64) << 8 * 2)
37-
| ((v[6] as u64) << 8 * 1)
38-
| ((v[7] as u64) << 8 * 0)
37+
((v[0] as u64) << 8*7) |
38+
((v[1] as u64) << 8*6) |
39+
((v[2] as u64) << 8*5) |
40+
((v[3] as u64) << 8*4) |
41+
((v[4] as u64) << 8*3) |
42+
((v[5] as u64) << 8*2) |
43+
((v[6] as u64) << 8*1) |
44+
((v[7] as u64) << 8*0)
3945
}
4046

4147
#[inline]
4248
pub fn be16_to_array(u: u16) -> [u8; 2] {
4349
let mut v = [0; 2];
44-
v[0] = ((u >> 8 * 1) & 0xff) as u8;
45-
v[1] = ((u >> 8 * 0) & 0xff) as u8;
50+
v[0] = ((u >> 8*1) & 0xff) as u8;
51+
v[1] = ((u >> 8*0) & 0xff) as u8;
4652
v
4753
}
4854
#[inline]
4955
pub fn be32_to_array(u: u32) -> [u8; 4] {
5056
let mut v = [0; 4];
51-
v[0] = ((u >> 8 * 3) & 0xff) as u8;
52-
v[1] = ((u >> 8 * 2) & 0xff) as u8;
53-
v[2] = ((u >> 8 * 1) & 0xff) as u8;
54-
v[3] = ((u >> 8 * 0) & 0xff) as u8;
57+
v[0] = ((u >> 8*3) & 0xff) as u8;
58+
v[1] = ((u >> 8*2) & 0xff) as u8;
59+
v[2] = ((u >> 8*1) & 0xff) as u8;
60+
v[3] = ((u >> 8*0) & 0xff) as u8;
5561
v
5662
}
5763
#[cfg(not(feature = "fuzztarget"))] // Used only by poly1305
5864
#[inline]
5965
pub fn le32_to_array(u: u32) -> [u8; 4] {
6066
let mut v = [0; 4];
61-
v[0] = ((u >> 8 * 0) & 0xff) as u8;
62-
v[1] = ((u >> 8 * 1) & 0xff) as u8;
63-
v[2] = ((u >> 8 * 2) & 0xff) as u8;
64-
v[3] = ((u >> 8 * 3) & 0xff) as u8;
67+
v[0] = ((u >> 8*0) & 0xff) as u8;
68+
v[1] = ((u >> 8*1) & 0xff) as u8;
69+
v[2] = ((u >> 8*2) & 0xff) as u8;
70+
v[3] = ((u >> 8*3) & 0xff) as u8;
6571
v
6672
}
6773
#[inline]
6874
pub fn be48_to_array(u: u64) -> [u8; 6] {
6975
assert!(u & 0xffff_0000_0000_0000 == 0);
7076
let mut v = [0; 6];
71-
v[0] = ((u >> 8 * 5) & 0xff) as u8;
72-
v[1] = ((u >> 8 * 4) & 0xff) as u8;
73-
v[2] = ((u >> 8 * 3) & 0xff) as u8;
74-
v[3] = ((u >> 8 * 2) & 0xff) as u8;
75-
v[4] = ((u >> 8 * 1) & 0xff) as u8;
76-
v[5] = ((u >> 8 * 0) & 0xff) as u8;
77+
v[0] = ((u >> 8*5) & 0xff) as u8;
78+
v[1] = ((u >> 8*4) & 0xff) as u8;
79+
v[2] = ((u >> 8*3) & 0xff) as u8;
80+
v[3] = ((u >> 8*2) & 0xff) as u8;
81+
v[4] = ((u >> 8*1) & 0xff) as u8;
82+
v[5] = ((u >> 8*0) & 0xff) as u8;
7783
v
7884
}
7985
#[inline]
8086
pub fn be64_to_array(u: u64) -> [u8; 8] {
8187
let mut v = [0; 8];
82-
v[0] = ((u >> 8 * 7) & 0xff) as u8;
83-
v[1] = ((u >> 8 * 6) & 0xff) as u8;
84-
v[2] = ((u >> 8 * 5) & 0xff) as u8;
85-
v[3] = ((u >> 8 * 4) & 0xff) as u8;
86-
v[4] = ((u >> 8 * 3) & 0xff) as u8;
87-
v[5] = ((u >> 8 * 2) & 0xff) as u8;
88-
v[6] = ((u >> 8 * 1) & 0xff) as u8;
89-
v[7] = ((u >> 8 * 0) & 0xff) as u8;
88+
v[0] = ((u >> 8*7) & 0xff) as u8;
89+
v[1] = ((u >> 8*6) & 0xff) as u8;
90+
v[2] = ((u >> 8*5) & 0xff) as u8;
91+
v[3] = ((u >> 8*4) & 0xff) as u8;
92+
v[4] = ((u >> 8*3) & 0xff) as u8;
93+
v[5] = ((u >> 8*2) & 0xff) as u8;
94+
v[6] = ((u >> 8*1) & 0xff) as u8;
95+
v[7] = ((u >> 8*0) & 0xff) as u8;
9096
v
9197
}
9298

9399
#[inline]
94100
pub fn le64_to_array(u: u64) -> [u8; 8] {
95101
let mut v = [0; 8];
96-
v[0] = ((u >> 8 * 0) & 0xff) as u8;
97-
v[1] = ((u >> 8 * 1) & 0xff) as u8;
98-
v[2] = ((u >> 8 * 2) & 0xff) as u8;
99-
v[3] = ((u >> 8 * 3) & 0xff) as u8;
100-
v[4] = ((u >> 8 * 4) & 0xff) as u8;
101-
v[5] = ((u >> 8 * 5) & 0xff) as u8;
102-
v[6] = ((u >> 8 * 6) & 0xff) as u8;
103-
v[7] = ((u >> 8 * 7) & 0xff) as u8;
102+
v[0] = ((u >> 8*0) & 0xff) as u8;
103+
v[1] = ((u >> 8*1) & 0xff) as u8;
104+
v[2] = ((u >> 8*2) & 0xff) as u8;
105+
v[3] = ((u >> 8*3) & 0xff) as u8;
106+
v[4] = ((u >> 8*4) & 0xff) as u8;
107+
v[5] = ((u >> 8*5) & 0xff) as u8;
108+
v[6] = ((u >> 8*6) & 0xff) as u8;
109+
v[7] = ((u >> 8*7) & 0xff) as u8;
104110
v
105111
}

0 commit comments

Comments
 (0)