Skip to content

Commit 59176e0

Browse files
committed
Update Clippy and fix lints
1 parent 7cda522 commit 59176e0

File tree

6 files changed

+8
-14
lines changed

6 files changed

+8
-14
lines changed

.github/workflows/workspace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: RustCrypto/actions/cargo-cache@master
1818
- uses: dtolnay/rust-toolchain@master
1919
with:
20-
toolchain: 1.60.0
20+
toolchain: 1.71.0
2121
components: clippy
2222
- run: cargo clippy --all -- -D warnings
2323

blake2/src/as_bytes.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,12 @@ pub trait AsBytes {
1919
impl<T: Safe> AsBytes for [T] {
2020
#[inline]
2121
fn as_bytes(&self) -> &[u8] {
22-
unsafe {
23-
slice::from_raw_parts(self.as_ptr() as *const u8, self.len() * mem::size_of::<T>())
24-
}
22+
unsafe { slice::from_raw_parts(self.as_ptr() as *const u8, mem::size_of_val(self)) }
2523
}
2624

2725
#[inline]
2826
fn as_mut_bytes(&mut self) -> &mut [u8] {
29-
unsafe {
30-
slice::from_raw_parts_mut(
31-
self.as_mut_ptr() as *mut u8,
32-
self.len() * mem::size_of::<T>(),
33-
)
34-
}
27+
unsafe { slice::from_raw_parts_mut(self.as_mut_ptr() as *mut u8, mem::size_of_val(self)) }
3528
}
3629
}
3730

blake2/src/simd/simd_opt/u32x4.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn rotate_right_const(vec: u32x4, n: u32) -> u32x4 {
2525

2626
#[inline(always)]
2727
fn rotate_right_any(vec: u32x4, n: u32) -> u32x4 {
28-
let r = n as u32;
28+
let r = n;
2929
let l = 32 - r;
3030

3131
(vec >> u32x4::new(r, r, r, r)) ^ (vec << u32x4::new(l, l, l, l))

blake2/tests/mac.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn blake2b_new_test() {
1616
.chain_update(DATA)
1717
.finalize()
1818
.into_bytes();
19-
let res2 = <T as Mac>::new_from_slice(&key)
19+
let res2 = <T as Mac>::new_from_slice(key)
2020
.unwrap()
2121
.chain_update(DATA)
2222
.finalize()

streebog/src/table.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,6 +2077,7 @@ mod test {
20772077
use super::SHUFFLED_LIN_TABLE;
20782078
use crate::consts::{A, P};
20792079

2080+
#[allow(clippy::needless_range_loop)]
20802081
fn gen_table() -> [[u64; 256]; 8] {
20812082
let mut table: [[u64; 256]; 8] = [[0; 256]; 8];
20822083
for i in 0..8 {

tiger/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl UpdateCore for TigerCore {
9191
impl FixedOutputCore for TigerCore {
9292
#[inline]
9393
fn finalize_fixed_core(&mut self, buffer: &mut Buffer<Self>, out: &mut Output<Self>) {
94-
let bs = Self::BlockSize::U64 as u64;
94+
let bs = Self::BlockSize::U64;
9595
let pos = buffer.get_pos() as u64;
9696
let bit_len = 8 * (pos + bs * self.block_len);
9797

@@ -165,7 +165,7 @@ impl UpdateCore for Tiger2Core {
165165
impl FixedOutputCore for Tiger2Core {
166166
#[inline]
167167
fn finalize_fixed_core(&mut self, buffer: &mut Buffer<Self>, out: &mut Output<Self>) {
168-
let bs = Self::BlockSize::U64 as u64;
168+
let bs = Self::BlockSize::U64;
169169
let pos = buffer.get_pos() as u64;
170170
let bit_len = 8 * (pos + bs * self.block_len);
171171

0 commit comments

Comments
 (0)