Fix (nightly) clippy warnings: explicit lifetime could be elided

Author: chifflier

src/data/pcap_nflog.rs

@@ -100,7 +100,7 @@ pub fn parse_nflog_header(i: &[u8]) -> IResult<&[u8], NflogHdr> {
     Ok((i, NflogHdr { af, vers, res_id }))
 }
 
-impl<'a> NflogPacket<'a> {
+impl NflogPacket<'_> {
     pub fn get(&self, attr: NfAttrType) -> Option<&NflogTlv> {
         self.data.iter().find(|v| v.t == attr as u16)
     }

src/pcap/capture.rs

@@ -37,7 +37,7 @@ pub struct LegacyPcapSlice<'a> {
     rem: &'a [u8],
 }
 
-impl<'a> LegacyPcapSlice<'a> {
+impl LegacyPcapSlice<'_> {
     pub fn from_slice(i: &[u8]) -> Result<LegacyPcapSlice, nom::Err<PcapError<&[u8]>>> {
         let (rem, header) = parse_pcap_header(i)?;
         Ok(LegacyPcapSlice { header, rem })
@@ -68,7 +68,7 @@ pub struct PcapCapture<'a> {
     pub blocks: Vec<LegacyPcapBlock<'a>>,
 }
 
-impl<'a> PcapCapture<'a> {
+impl PcapCapture<'_> {
     pub fn from_file(i: &[u8]) -> Result<PcapCapture, PcapError<&[u8]>> {
         match parse_pcap(i) {
             Ok((_, pcap)) => Ok(pcap),
@@ -79,7 +79,7 @@ impl<'a> PcapCapture<'a> {
     }
 }
 
-impl<'a> fmt::Debug for PcapCapture<'a> {
+impl fmt::Debug for PcapCapture<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         writeln!(f, "PcapCapture:")
     }
@@ -102,7 +102,7 @@ impl<'a> Iterator for LegacyPcapIterator<'a> {
     }
 }
 
-impl<'a> Capture for PcapCapture<'a> {
+impl Capture for PcapCapture<'_> {
     fn get_datalink(&self) -> Linktype {
         self.header.network
     }

src/pcapng/block.rs

@@ -25,7 +25,7 @@ pub enum Block<'a> {
     Unknown(UnknownBlock<'a>),
 }
 
-impl<'a> Block<'a> {
+impl Block<'_> {
     /// Returns true if blocks contains a network packet
     pub fn is_data_block(&self) -> bool {
         matches!(self, &Block::EnhancedPacket(_) | &Block::SimplePacket(_))

src/pcapng/capture.rs

@@ -33,7 +33,7 @@ pub struct PcapNGSlice<'a> {
     rem: &'a [u8],
 }
 
-impl<'a> PcapNGSlice<'a> {
+impl PcapNGSlice<'_> {
     pub fn from_slice(i: &[u8]) -> Result<PcapNGSlice, nom::Err<PcapError<&[u8]>>> {
         // just check that first block is a valid one
         let (_rem, _shb) = parse_sectionheaderblock(i)?;
@@ -73,7 +73,7 @@ pub struct PcapNGCapture<'a> {
     pub sections: Vec<Section<'a>>,
 }
 
-impl<'a> fmt::Debug for PcapNGCapture<'a> {
+impl fmt::Debug for PcapNGCapture<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         writeln!(f, "PcapNGCapture:")
     }

src/pcapng/custom.rs

@@ -64,7 +64,7 @@ impl<'a, En: PcapEndianness> PcapNGBlockParser<'a, En, CustomBlock<'a>> for DCBP
     }
 }
 
-impl<'a> CustomBlock<'a> {
+impl CustomBlock<'_> {
     pub fn do_not_copy(&self) -> bool {
         self.block_type == DCB_MAGIC || self.block_type == DCB_MAGIC.swap_bytes()
     }

src/pcapng/enhanced_packet.rs

@@ -52,7 +52,7 @@ pub struct EnhancedPacketBlock<'a> {
     pub block_len2: u32,
 }
 
-impl<'a> EnhancedPacketBlock<'a> {
+impl EnhancedPacketBlock<'_> {
     /// Decode the packet timestamp
     ///
     /// To decode the timestamp, the raw values if_tsresol and if_tsoffset are required.
@@ -76,7 +76,7 @@ impl<'a> EnhancedPacketBlock<'a> {
     }
 }
 
-impl<'a> PcapNGPacketBlock for EnhancedPacketBlock<'a> {
+impl PcapNGPacketBlock for EnhancedPacketBlock<'_> {
     fn big_endian(&self) -> bool {
         self.block_type != EPB_MAGIC
     }

src/pcapng/interface_description.rs

@@ -23,7 +23,7 @@ pub struct InterfaceDescriptionBlock<'a> {
     pub if_tsoffset: i64,
 }
 
-impl<'a> InterfaceDescriptionBlock<'a> {
+impl InterfaceDescriptionBlock<'_> {
     /// Decode the interface time resolution, in units per second
     ///
     /// Return the resolution, or `None` if the resolution is invalid (for ex. greater than `2^64`)

src/pcapng/interface_statistics.rs

@@ -17,7 +17,7 @@ pub struct InterfaceStatisticsBlock<'a> {
     pub block_len2: u32,
 }
 
-impl<'a> InterfaceStatisticsBlock<'a> {
+impl InterfaceStatisticsBlock<'_> {
     /// Return the `isb_starttime` option value, if present
     ///
     /// The returned value is `(ts_high,ts_low)`. To convert to a full timestamp,

src/pcapng/name_resolution.rs

@@ -27,7 +27,7 @@ pub struct NameRecord<'a> {
     pub record_value: &'a [u8],
 }
 
-impl<'a> NameRecord<'a> {
+impl NameRecord<'_> {
     pub const END: NameRecord<'static> = NameRecord {
         record_type: NameRecordType::End,
         record_value: &[],

src/pcapng/option.rs

@@ -80,7 +80,7 @@ pub struct PcapNGOption<'a> {
     pub value: Cow<'a, [u8]>,
 }
 
-impl<'a> PcapNGOption<'a> {
+impl PcapNGOption<'_> {
     /// Return a reference to the option value, as raw bytes (not related to the `len` field)
     #[inline]
     pub fn value(&self) -> &[u8] {

src/pcapng/section_header.rs

@@ -27,7 +27,7 @@ pub struct SectionHeaderBlock<'a> {
     pub block_len2: u32,
 }
 
-impl<'a> SectionHeaderBlock<'a> {
+impl SectionHeaderBlock<'_> {
     pub fn big_endian(&self) -> bool {
         self.bom != BOM_MAGIC
     }

src/pcapng/simple_packet.rs

@@ -25,7 +25,7 @@ pub struct SimplePacketBlock<'a> {
     pub block_len2: u32,
 }
 
-impl<'a> PcapNGPacketBlock for SimplePacketBlock<'a> {
+impl PcapNGPacketBlock for SimplePacketBlock<'_> {
     fn big_endian(&self) -> bool {
         self.block_type != SPB_MAGIC
     }

src/serialize.rs

@@ -45,7 +45,7 @@ impl ToVec for PcapHeader {
     }
 }
 
-impl<'a> ToVec for LegacyPcapBlock<'a> {
+impl ToVec for LegacyPcapBlock<'_> {
     fn to_vec_raw(&self) -> Result<Vec<u8>, GenError> {
         let mut v = Vec::with_capacity(self.data.len() + 16);
 
@@ -73,7 +73,7 @@ fn padding_for<'a, W: Write + 'a>(unaligned_length: u32) -> impl SerializeFn<W>
     })
 }
 
-impl<'a> ToVec for PcapNGOption<'a> {
+impl ToVec for PcapNGOption<'_> {
     fn to_vec_raw(&self) -> Result<Vec<u8>, GenError> {
         let mut v = Vec::new();
         gen(pcapngoption_le(self), &mut v).map(|res| res.0.to_vec())
@@ -106,7 +106,7 @@ fn fix_options(options: &mut Vec<PcapNGOption>) {
     }
 }
 
-impl<'a> ToVec for SectionHeaderBlock<'a> {
+impl ToVec for SectionHeaderBlock<'_> {
     /// Check and correct all fields: use magic, version and fix lengths fields
     fn fix(&mut self) {
         self.block_type = SHB_MAGIC;
@@ -140,7 +140,7 @@ impl<'a> ToVec for SectionHeaderBlock<'a> {
     }
 }
 
-impl<'a> ToVec for InterfaceDescriptionBlock<'a> {
+impl ToVec for InterfaceDescriptionBlock<'_> {
     /// Check and correct all fields: use magic, set time resolution and fix lengths fields
     fn fix(&mut self) {
         self.block_type = IDB_MAGIC;
@@ -192,7 +192,7 @@ impl<'a> ToVec for InterfaceDescriptionBlock<'a> {
     }
 }
 
-impl<'a> ToVec for EnhancedPacketBlock<'a> {
+impl ToVec for EnhancedPacketBlock<'_> {
     /// Check and correct all fields: use magic, version and fix lengths fields
     fn fix(&mut self) {
         self.block_type = EPB_MAGIC;
@@ -225,7 +225,7 @@ impl<'a> ToVec for EnhancedPacketBlock<'a> {
     }
 }
 
-impl<'a> ToVec for SimplePacketBlock<'a> {
+impl ToVec for SimplePacketBlock<'_> {
     fn fix(&mut self) {
         self.block_type = SPB_MAGIC;
         // fix length
@@ -262,7 +262,7 @@ fn namerecords_length(nr: &[NameRecord]) -> usize {
     nr.iter().map(|n| align32!(2 + n.record_value.len())).sum()
 }
 
-impl<'a> ToVec for NameResolutionBlock<'a> {
+impl ToVec for NameResolutionBlock<'_> {
     fn fix(&mut self) {
         self.block_type = NRB_MAGIC;
         fix_options(&mut self.options);
@@ -288,7 +288,7 @@ impl<'a> ToVec for NameResolutionBlock<'a> {
     }
 }
 
-impl<'a> ToVec for InterfaceStatisticsBlock<'a> {
+impl ToVec for InterfaceStatisticsBlock<'_> {
     fn fix(&mut self) {
         self.block_type = ISB_MAGIC;
         fix_options(&mut self.options);
@@ -315,7 +315,7 @@ impl<'a> ToVec for InterfaceStatisticsBlock<'a> {
     }
 }
 
-impl<'a> ToVec for SystemdJournalExportBlock<'a> {
+impl ToVec for SystemdJournalExportBlock<'_> {
     fn fix(&mut self) {
         if self.block_type != SJE_MAGIC {
             self.block_type = SJE_MAGIC;
@@ -341,7 +341,7 @@ impl<'a> ToVec for SystemdJournalExportBlock<'a> {
     }
 }
 
-impl<'a> ToVec for DecryptionSecretsBlock<'a> {
+impl ToVec for DecryptionSecretsBlock<'_> {
     fn fix(&mut self) {
         if self.block_type != DSB_MAGIC {
             self.block_type = DSB_MAGIC;
@@ -372,7 +372,7 @@ impl<'a> ToVec for DecryptionSecretsBlock<'a> {
     }
 }
 
-impl<'a> ToVec for ProcessInformationBlock<'a> {
+impl ToVec for ProcessInformationBlock<'_> {
     /// Check and correct all fields: use magic, version and fix lengths fields
     fn fix(&mut self) {
         self.block_type = PIB_MAGIC;
@@ -399,7 +399,7 @@ impl<'a> ToVec for ProcessInformationBlock<'a> {
     }
 }
 
-impl<'a> ToVec for CustomBlock<'a> {
+impl ToVec for CustomBlock<'_> {
     fn fix(&mut self) {
         if self.block_type != DCB_MAGIC && self.block_type != CB_MAGIC {
             self.block_type = CB_MAGIC;
@@ -426,7 +426,7 @@ impl<'a> ToVec for CustomBlock<'a> {
     }
 }
 
-impl<'a> ToVec for UnknownBlock<'a> {
+impl ToVec for UnknownBlock<'_> {
     fn fix(&mut self) {
         // do not touch type, it is unknown
         // fix length
@@ -450,7 +450,7 @@ impl<'a> ToVec for UnknownBlock<'a> {
     }
 }
 
-impl<'a> ToVec for Block<'a> {
+impl ToVec for Block<'_> {
     fn fix(&mut self) {
         match self {
             Block::SectionHeader(b) => b.fix(),

src/utils.rs

@@ -13,7 +13,7 @@ pub enum MutableData<'a> {
     Borrowed(&'a mut [u8]),
 }
 
-impl<'a> Data<'a> {
+impl Data<'_> {
     #[inline]
     pub fn as_slice(&self) -> &[u8] {
         match self {
@@ -77,21 +77,21 @@ impl<'a> MutableData<'a> {
 
 /* AsRef */
 
-impl<'a> AsRef<[u8]> for Data<'a> {
+impl AsRef<[u8]> for Data<'_> {
     #[inline]
     fn as_ref(&self) -> &[u8] {
         self.as_slice()
     }
 }
 
-impl<'a> AsRef<[u8]> for MutableData<'a> {
+impl AsRef<[u8]> for MutableData<'_> {
     #[inline]
     fn as_ref(&self) -> &[u8] {
         self.as_slice()
     }
 }
 
-impl<'a> AsMut<[u8]> for MutableData<'a> {
+impl AsMut<[u8]> for MutableData<'_> {
     #[inline]
     fn as_mut(&mut self) -> &mut [u8] {
         self.as_mut_slice()