Skip to content

Fix clippy errors: resolve always-return-zero operations #3223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix clippy errors: resolve always-return-zero operations #3223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lightning/src/crypto/chacha20.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ mod real_chacha {
fn from_bytes(bytes: &[u8]) -> Self {
assert_eq!(bytes.len(), 4*4);
Self (
u32::from_le_bytes(bytes[0*4..1*4].try_into().expect("len is 4")),
u32::from_le_bytes(bytes[0..1*4].try_into().expect("len is 4")),
u32::from_le_bytes(bytes[1*4..2*4].try_into().expect("len is 4")),
u32::from_le_bytes(bytes[2*4..3*4].try_into().expect("len is 4")),
u32::from_le_bytes(bytes[3*4..4*4].try_into().expect("len is 4")),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1829,7 +1829,7 @@ pub fn get_commitment_transaction_number_obscure_factor(
| ((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[31] as u64)
}

#[cfg(test)]
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/util/byte_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub fn slice_to_be48(v: &[u8]) -> u64 {
((v[2] as u64) << 8*3) |
((v[3] as u64) << 8*2) |
((v[4] as u64) << 8*1) |
((v[5] as u64) << 8*0)
(v[5] as u64)
}
#[inline]
pub fn be48_to_array(u: u64) -> [u8; 6] {
Expand All @@ -25,7 +25,7 @@ pub fn be48_to_array(u: u64) -> [u8; 6] {
v[2] = ((u >> 8*3) & 0xff) as u8;
v[3] = ((u >> 8*2) & 0xff) as u8;
v[4] = ((u >> 8*1) & 0xff) as u8;
v[5] = ((u >> 8*0) & 0xff) as u8;
v[5] = (u & 0xff) as u8;
v
}

Expand Down
Loading