Skip to content

Commit f575f2b

Browse files
authored
Fix new Clippy lints (#1710)
1 parent a1ade1b commit f575f2b

File tree

10 files changed

+33
-34
lines changed

10 files changed

+33
-34
lines changed

.github/workflows/workspace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: RustCrypto/actions/cargo-cache@master
2525
- uses: dtolnay/rust-toolchain@master
2626
with:
27-
toolchain: 1.81.0
27+
toolchain: 1.82.0
2828
components: clippy
2929
- run: cargo clippy --all --all-features --tests -- -D warnings
3030

aead/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ pub struct Payload<'msg, 'aad> {
487487
}
488488

489489
#[cfg(feature = "alloc")]
490-
impl<'msg, 'aad> From<&'msg [u8]> for Payload<'msg, 'aad> {
490+
impl<'msg> From<&'msg [u8]> for Payload<'msg, '_> {
491491
fn from(msg: &'msg [u8]) -> Self {
492492
Self { msg, aad: b"" }
493493
}

cipher/src/block/ctx.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@ pub(super) struct BlockCtx<'inp, 'out, BS: BlockSizes> {
1111
pub block: InOut<'inp, 'out, Block<Self>>,
1212
}
1313

14-
impl<'inp, 'out, BS: BlockSizes> BlockSizeUser for BlockCtx<'inp, 'out, BS> {
14+
impl<BS: BlockSizes> BlockSizeUser for BlockCtx<'_, '_, BS> {
1515
type BlockSize = BS;
1616
}
1717

18-
impl<'inp, 'out, BS: BlockSizes> BlockCipherEncClosure for BlockCtx<'inp, 'out, BS> {
18+
impl<BS: BlockSizes> BlockCipherEncClosure for BlockCtx<'_, '_, BS> {
1919
#[inline(always)]
2020
fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, backend: &B) {
2121
backend.encrypt_block(self.block);
2222
}
2323
}
2424

25-
impl<'inp, 'out, BS: BlockSizes> BlockCipherDecClosure for BlockCtx<'inp, 'out, BS> {
25+
impl<BS: BlockSizes> BlockCipherDecClosure for BlockCtx<'_, '_, BS> {
2626
#[inline(always)]
2727
fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, backend: &B) {
2828
backend.decrypt_block(self.block);
2929
}
3030
}
3131

32-
impl<'inp, 'out, BS: BlockSizes> BlockModeEncClosure for BlockCtx<'inp, 'out, BS> {
32+
impl<BS: BlockSizes> BlockModeEncClosure for BlockCtx<'_, '_, BS> {
3333
#[inline(always)]
3434
fn call<B: BlockModeEncBackend<BlockSize = BS>>(self, backend: &mut B) {
3535
backend.encrypt_block(self.block);
3636
}
3737
}
3838

39-
impl<'inp, 'out, BS: BlockSizes> BlockModeDecClosure for BlockCtx<'inp, 'out, BS> {
39+
impl<BS: BlockSizes> BlockModeDecClosure for BlockCtx<'_, '_, BS> {
4040
#[inline(always)]
4141
fn call<B: BlockModeDecBackend<BlockSize = BS>>(self, backend: &mut B) {
4242
backend.decrypt_block(self.block);
@@ -47,11 +47,11 @@ pub(super) struct BlocksCtx<'inp, 'out, BS: BlockSizes> {
4747
pub blocks: InOutBuf<'inp, 'out, Block<Self>>,
4848
}
4949

50-
impl<'inp, 'out, BS: BlockSizes> BlockSizeUser for BlocksCtx<'inp, 'out, BS> {
50+
impl<BS: BlockSizes> BlockSizeUser for BlocksCtx<'_, '_, BS> {
5151
type BlockSize = BS;
5252
}
5353

54-
impl<'inp, 'out, BS: BlockSizes> BlockCipherEncClosure for BlocksCtx<'inp, 'out, BS> {
54+
impl<BS: BlockSizes> BlockCipherEncClosure for BlocksCtx<'_, '_, BS> {
5555
#[inline(always)]
5656
fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, backend: &B) {
5757
if B::ParBlocksSize::USIZE > 1 {
@@ -68,7 +68,7 @@ impl<'inp, 'out, BS: BlockSizes> BlockCipherEncClosure for BlocksCtx<'inp, 'out,
6868
}
6969
}
7070

71-
impl<'inp, 'out, BS: BlockSizes> BlockCipherDecClosure for BlocksCtx<'inp, 'out, BS> {
71+
impl<BS: BlockSizes> BlockCipherDecClosure for BlocksCtx<'_, '_, BS> {
7272
#[inline(always)]
7373
fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, backend: &B) {
7474
if B::ParBlocksSize::USIZE > 1 {
@@ -85,7 +85,7 @@ impl<'inp, 'out, BS: BlockSizes> BlockCipherDecClosure for BlocksCtx<'inp, 'out,
8585
}
8686
}
8787

88-
impl<'inp, 'out, BS: BlockSizes> BlockModeEncClosure for BlocksCtx<'inp, 'out, BS> {
88+
impl<BS: BlockSizes> BlockModeEncClosure for BlocksCtx<'_, '_, BS> {
8989
#[inline(always)]
9090
fn call<B: BlockModeEncBackend<BlockSize = BS>>(self, backend: &mut B) {
9191
if B::ParBlocksSize::USIZE > 1 {
@@ -102,7 +102,7 @@ impl<'inp, 'out, BS: BlockSizes> BlockModeEncClosure for BlocksCtx<'inp, 'out, B
102102
}
103103
}
104104

105-
impl<'inp, 'out, BS: BlockSizes> BlockModeDecClosure for BlocksCtx<'inp, 'out, BS> {
105+
impl<BS: BlockSizes> BlockModeDecClosure for BlocksCtx<'_, '_, BS> {
106106
#[inline(always)]
107107
fn call<B: BlockModeDecBackend<BlockSize = BS>>(self, backend: &mut B) {
108108
if B::ParBlocksSize::USIZE > 1 {

cipher/src/stream/core_api.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ impl_counter! { u32 u64 u128 }
190190
struct WriteBlockCtx<'a, BS: BlockSizes> {
191191
block: &'a mut Block<Self>,
192192
}
193-
impl<'a, BS: BlockSizes> BlockSizeUser for WriteBlockCtx<'a, BS> {
193+
impl<BS: BlockSizes> BlockSizeUser for WriteBlockCtx<'_, BS> {
194194
type BlockSize = BS;
195195
}
196-
impl<'a, BS: BlockSizes> StreamCipherClosure for WriteBlockCtx<'a, BS> {
196+
impl<BS: BlockSizes> StreamCipherClosure for WriteBlockCtx<'_, BS> {
197197
#[inline(always)]
198198
fn call<B: StreamCipherBackend<BlockSize = BS>>(self, backend: &mut B) {
199199
backend.gen_ks_block(self.block);
@@ -203,10 +203,10 @@ impl<'a, BS: BlockSizes> StreamCipherClosure for WriteBlockCtx<'a, BS> {
203203
struct WriteBlocksCtx<'a, BS: BlockSizes> {
204204
blocks: &'a mut [Block<Self>],
205205
}
206-
impl<'a, BS: BlockSizes> BlockSizeUser for WriteBlocksCtx<'a, BS> {
206+
impl<BS: BlockSizes> BlockSizeUser for WriteBlocksCtx<'_, BS> {
207207
type BlockSize = BS;
208208
}
209-
impl<'a, BS: BlockSizes> StreamCipherClosure for WriteBlocksCtx<'a, BS> {
209+
impl<BS: BlockSizes> StreamCipherClosure for WriteBlocksCtx<'_, BS> {
210210
#[inline(always)]
211211
fn call<B: StreamCipherBackend<BlockSize = BS>>(self, backend: &mut B) {
212212
if B::ParBlocksSize::USIZE > 1 {
@@ -227,11 +227,11 @@ struct ApplyBlockCtx<'inp, 'out, BS: BlockSizes> {
227227
block: InOut<'inp, 'out, Block<Self>>,
228228
}
229229

230-
impl<'inp, 'out, BS: BlockSizes> BlockSizeUser for ApplyBlockCtx<'inp, 'out, BS> {
230+
impl<BS: BlockSizes> BlockSizeUser for ApplyBlockCtx<'_, '_, BS> {
231231
type BlockSize = BS;
232232
}
233233

234-
impl<'inp, 'out, BS: BlockSizes> StreamCipherClosure for ApplyBlockCtx<'inp, 'out, BS> {
234+
impl<BS: BlockSizes> StreamCipherClosure for ApplyBlockCtx<'_, '_, BS> {
235235
#[inline(always)]
236236
fn call<B: StreamCipherBackend<BlockSize = BS>>(mut self, backend: &mut B) {
237237
let mut t = Default::default();
@@ -244,11 +244,11 @@ struct ApplyBlocksCtx<'inp, 'out, BS: BlockSizes> {
244244
blocks: InOutBuf<'inp, 'out, Block<Self>>,
245245
}
246246

247-
impl<'inp, 'out, BS: BlockSizes> BlockSizeUser for ApplyBlocksCtx<'inp, 'out, BS> {
247+
impl<BS: BlockSizes> BlockSizeUser for ApplyBlocksCtx<'_, '_, BS> {
248248
type BlockSize = BS;
249249
}
250250

251-
impl<'inp, 'out, BS: BlockSizes> StreamCipherClosure for ApplyBlocksCtx<'inp, 'out, BS> {
251+
impl<BS: BlockSizes> StreamCipherClosure for ApplyBlocksCtx<'_, '_, BS> {
252252
#[inline(always)]
253253
#[allow(clippy::needless_range_loop)]
254254
fn call<B: StreamCipherBackend<BlockSize = BS>>(self, backend: &mut B) {

cipher/src/stream/wrapper.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ impl<T: StreamCipherCore> StreamCipherCoreWrapper<T> {
106106
};
107107

108108
let bs = T::BlockSize::USIZE;
109-
// TODO: use div_ceil on 1.73+ MSRV bump
110-
let blocks = (data_len + bs - 1) / bs;
109+
let blocks = data_len.div_ceil(bs);
111110
if blocks > rem_blocks {
112111
Err(StreamCipherError)
113112
} else {

password-hash/src/ident.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ impl<'a> Ident<'a> {
9191
}
9292
}
9393

94-
impl<'a> AsRef<str> for Ident<'a> {
94+
impl AsRef<str> for Ident<'_> {
9595
fn as_ref(&self) -> &str {
9696
self.as_str()
9797
}
9898
}
9999

100-
impl<'a> Deref for Ident<'a> {
100+
impl Deref for Ident<'_> {
101101
type Target = str;
102102

103103
fn deref(&self) -> &str {
@@ -115,13 +115,13 @@ impl<'a> TryFrom<&'a str> for Ident<'a> {
115115
}
116116
}
117117

118-
impl<'a> fmt::Display for Ident<'a> {
118+
impl fmt::Display for Ident<'_> {
119119
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
120120
f.write_str(self)
121121
}
122122
}
123123

124-
impl<'a> fmt::Debug for Ident<'a> {
124+
impl fmt::Debug for Ident<'_> {
125125
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
126126
f.debug_tuple("Ident").field(&self.as_ref()).finish()
127127
}

password-hash/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ impl<'a> TryFrom<&'a str> for PasswordHash<'a> {
250250
}
251251
}
252252

253-
impl<'a> fmt::Display for PasswordHash<'a> {
253+
impl fmt::Display for PasswordHash<'_> {
254254
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
255255
write!(f, "{}{}", PASSWORD_HASH_SEPARATOR, self.algorithm)?;
256256

password-hash/src/salt.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ impl<'a> Salt<'a> {
163163
}
164164
}
165165

166-
impl<'a> AsRef<str> for Salt<'a> {
166+
impl AsRef<str> for Salt<'_> {
167167
fn as_ref(&self) -> &str {
168168
self.as_str()
169169
}
@@ -177,13 +177,13 @@ impl<'a> TryFrom<&'a str> for Salt<'a> {
177177
}
178178
}
179179

180-
impl<'a> fmt::Display for Salt<'a> {
180+
impl fmt::Display for Salt<'_> {
181181
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
182182
f.write_str(self.as_str())
183183
}
184184
}
185185

186-
impl<'a> fmt::Debug for Salt<'a> {
186+
impl fmt::Debug for Salt<'_> {
187187
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
188188
write!(f, "Salt({:?})", self.as_str())
189189
}

password-hash/src/value.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl<'a> Value<'a> {
154154
}
155155
}
156156

157-
impl<'a> AsRef<str> for Value<'a> {
157+
impl AsRef<str> for Value<'_> {
158158
fn as_ref(&self) -> &str {
159159
self.as_str()
160160
}
@@ -184,7 +184,7 @@ impl<'a> TryFrom<&Value<'a>> for Decimal {
184184
}
185185
}
186186

187-
impl<'a> fmt::Display for Value<'a> {
187+
impl fmt::Display for Value<'_> {
188188
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
189189
f.write_str(self.as_str())
190190
}

universal-hash/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ pub trait UniversalHash: BlockSizeUser + Sized {
6464
blocks: &'a [Block<Self>],
6565
}
6666

67-
impl<'a, BS: BlockSizes> BlockSizeUser for Ctx<'a, BS> {
67+
impl<BS: BlockSizes> BlockSizeUser for Ctx<'_, BS> {
6868
type BlockSize = BS;
6969
}
7070

71-
impl<'a, BS: BlockSizes> UhfClosure for Ctx<'a, BS> {
71+
impl<BS: BlockSizes> UhfClosure for Ctx<'_, BS> {
7272
#[inline(always)]
7373
fn call<B: UhfBackend<BlockSize = BS>>(self, backend: &mut B) {
7474
let pb = B::ParBlocksSize::USIZE;

0 commit comments

Comments
 (0)