Skip to content

Commit ab33fb7

Browse files
committed
Merge #210: fix: fix clippy warnings
5e44fcd fix: fix clippy warnings (Dimitris Apostolou) Pull request description: ACKs for top commit: apoelstra: ACK 5e44fcd; successfully ran local tests Tree-SHA512: 1a585f486508131bf6c6b80b7254753522e447d39c3309cbdc33813e9248c6d525fe1001b36254c272100df0cf6d6eb27422358218f7810be3b554c025c606ef
2 parents 860641a + 5e44fcd commit ab33fb7

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

src/primitives/checksum.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ impl<'a, ExtField> PrintImpl<'a, ExtField> {
227227
}
228228
}
229229

230-
impl<'a, ExtField> fmt::Display for PrintImpl<'a, ExtField>
230+
impl<ExtField> fmt::Display for PrintImpl<'_, ExtField>
231231
where
232232
ExtField: super::Bech32Field + super::ExtensionField<BaseField = Fe32>,
233233
{
@@ -466,7 +466,7 @@ impl<'hrp> HrpFe32Iter<'hrp> {
466466
}
467467
}
468468

469-
impl<'hrp> Iterator for HrpFe32Iter<'hrp> {
469+
impl Iterator for HrpFe32Iter<'_> {
470470
type Item = Fe32;
471471
#[inline]
472472
fn next(&mut self) -> Option<Fe32> {

src/primitives/correction.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ pub struct ErrorIterator<'c, Ck: Checksum> {
262262
c: usize,
263263
}
264264

265-
impl<'c, Ck: Checksum> Iterator for ErrorIterator<'c, Ck> {
265+
impl<Ck: Checksum> Iterator for ErrorIterator<'_, Ck> {
266266
type Item = (usize, Fe32);
267267

268268
fn next(&mut self) -> Option<Self::Item> {

src/primitives/decode.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -709,15 +709,15 @@ pub struct ByteIter<'s> {
709709
iter: FesToBytes<AsciiToFe32Iter<'s>>,
710710
}
711711

712-
impl<'s> Iterator for ByteIter<'s> {
712+
impl Iterator for ByteIter<'_> {
713713
type Item = u8;
714714
#[inline]
715715
fn next(&mut self) -> Option<u8> { self.iter.next() }
716716
#[inline]
717717
fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
718718
}
719719

720-
impl<'s> ExactSizeIterator for ByteIter<'s> {
720+
impl ExactSizeIterator for ByteIter<'_> {
721721
#[inline]
722722
fn len(&self) -> usize { self.iter.len() }
723723
}
@@ -733,7 +733,7 @@ pub struct AsciiToFe32Iter<'s> {
733733
iter: iter::Copied<slice::Iter<'s, u8>>,
734734
}
735735

736-
impl<'s> Iterator for AsciiToFe32Iter<'s> {
736+
impl Iterator for AsciiToFe32Iter<'_> {
737737
type Item = Fe32;
738738
#[inline]
739739
fn next(&mut self) -> Option<Fe32> { self.iter.next().map(Fe32::from_char_unchecked) }
@@ -744,7 +744,7 @@ impl<'s> Iterator for AsciiToFe32Iter<'s> {
744744
}
745745
}
746746

747-
impl<'s> ExactSizeIterator for AsciiToFe32Iter<'s> {
747+
impl ExactSizeIterator for AsciiToFe32Iter<'_> {
748748
#[inline]
749749
fn len(&self) -> usize { self.iter.len() }
750750
}

src/primitives/encode.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ where
199199
}
200200
}
201201

202-
impl<'a, I, Ck> Iterator for CharIter<'a, I, Ck>
202+
impl<I, Ck> Iterator for CharIter<'_, I, Ck>
203203
where
204204
I: Iterator<Item = Fe32>,
205205
Ck: Checksum,
@@ -269,7 +269,7 @@ where
269269
pub fn new(char_iter: CharIter<'hrp, I, Ck>) -> Self { Self { char_iter } }
270270
}
271271

272-
impl<'a, I, Ck> Iterator for ByteIter<'a, I, Ck>
272+
impl<I, Ck> Iterator for ByteIter<'_, I, Ck>
273273
where
274274
I: Iterator<Item = Fe32>,
275275
Ck: Checksum,
@@ -311,7 +311,7 @@ where
311311
}
312312
}
313313

314-
impl<'hrp, I, Ck> Iterator for Fe32Iter<'hrp, I, Ck>
314+
impl<I, Ck> Iterator for Fe32Iter<'_, I, Ck>
315315
where
316316
I: Iterator<Item = Fe32>,
317317
Ck: Checksum,

src/primitives/hrp.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -341,25 +341,25 @@ pub struct ByteIter<'b> {
341341
iter: slice::Iter<'b, u8>,
342342
}
343343

344-
impl<'b> Iterator for ByteIter<'b> {
344+
impl Iterator for ByteIter<'_> {
345345
type Item = u8;
346346
#[inline]
347347
fn next(&mut self) -> Option<u8> { self.iter.next().copied() }
348348
#[inline]
349349
fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
350350
}
351351

352-
impl<'b> ExactSizeIterator for ByteIter<'b> {
352+
impl ExactSizeIterator for ByteIter<'_> {
353353
#[inline]
354354
fn len(&self) -> usize { self.iter.len() }
355355
}
356356

357-
impl<'b> DoubleEndedIterator for ByteIter<'b> {
357+
impl DoubleEndedIterator for ByteIter<'_> {
358358
#[inline]
359359
fn next_back(&mut self) -> Option<Self::Item> { self.iter.next_back().copied() }
360360
}
361361

362-
impl<'b> FusedIterator for ByteIter<'b> {}
362+
impl FusedIterator for ByteIter<'_> {}
363363

364364
/// Iterator over ASCII characters of the human-readable part.
365365
///
@@ -368,32 +368,32 @@ pub struct CharIter<'b> {
368368
iter: ByteIter<'b>,
369369
}
370370

371-
impl<'b> Iterator for CharIter<'b> {
371+
impl Iterator for CharIter<'_> {
372372
type Item = char;
373373
#[inline]
374374
fn next(&mut self) -> Option<char> { self.iter.next().map(Into::into) }
375375
#[inline]
376376
fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
377377
}
378378

379-
impl<'b> ExactSizeIterator for CharIter<'b> {
379+
impl ExactSizeIterator for CharIter<'_> {
380380
#[inline]
381381
fn len(&self) -> usize { self.iter.len() }
382382
}
383383

384-
impl<'b> DoubleEndedIterator for CharIter<'b> {
384+
impl DoubleEndedIterator for CharIter<'_> {
385385
#[inline]
386386
fn next_back(&mut self) -> Option<Self::Item> { self.iter.next_back().map(Into::into) }
387387
}
388388

389-
impl<'b> FusedIterator for CharIter<'b> {}
389+
impl FusedIterator for CharIter<'_> {}
390390

391391
/// Iterator over lowercase bytes (ASCII characters) of the human-readable part.
392392
pub struct LowercaseByteIter<'b> {
393393
iter: ByteIter<'b>,
394394
}
395395

396-
impl<'b> Iterator for LowercaseByteIter<'b> {
396+
impl Iterator for LowercaseByteIter<'_> {
397397
type Item = u8;
398398
#[inline]
399399
fn next(&mut self) -> Option<u8> {
@@ -403,44 +403,44 @@ impl<'b> Iterator for LowercaseByteIter<'b> {
403403
fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
404404
}
405405

406-
impl<'b> ExactSizeIterator for LowercaseByteIter<'b> {
406+
impl ExactSizeIterator for LowercaseByteIter<'_> {
407407
#[inline]
408408
fn len(&self) -> usize { self.iter.len() }
409409
}
410410

411-
impl<'b> DoubleEndedIterator for LowercaseByteIter<'b> {
411+
impl DoubleEndedIterator for LowercaseByteIter<'_> {
412412
#[inline]
413413
fn next_back(&mut self) -> Option<Self::Item> {
414414
self.iter.next_back().map(|b| if is_ascii_uppercase(b) { b | 32 } else { b })
415415
}
416416
}
417417

418-
impl<'b> FusedIterator for LowercaseByteIter<'b> {}
418+
impl FusedIterator for LowercaseByteIter<'_> {}
419419

420420
/// Iterator over lowercase ASCII characters of the human-readable part.
421421
pub struct LowercaseCharIter<'b> {
422422
iter: LowercaseByteIter<'b>,
423423
}
424424

425-
impl<'b> Iterator for LowercaseCharIter<'b> {
425+
impl Iterator for LowercaseCharIter<'_> {
426426
type Item = char;
427427
#[inline]
428428
fn next(&mut self) -> Option<char> { self.iter.next().map(Into::into) }
429429
#[inline]
430430
fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
431431
}
432432

433-
impl<'b> ExactSizeIterator for LowercaseCharIter<'b> {
433+
impl ExactSizeIterator for LowercaseCharIter<'_> {
434434
#[inline]
435435
fn len(&self) -> usize { self.iter.len() }
436436
}
437437

438-
impl<'b> DoubleEndedIterator for LowercaseCharIter<'b> {
438+
impl DoubleEndedIterator for LowercaseCharIter<'_> {
439439
#[inline]
440440
fn next_back(&mut self) -> Option<Self::Item> { self.iter.next_back().map(Into::into) }
441441
}
442442

443-
impl<'b> FusedIterator for LowercaseCharIter<'b> {}
443+
impl FusedIterator for LowercaseCharIter<'_> {}
444444

445445
fn is_ascii_uppercase(b: u8) -> bool { (65..=90).contains(&b) }
446446

0 commit comments

Comments
 (0)