From 65f37d0d1ff851b08d381fed4a1b96918cc2fb3d Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Fri, 11 Oct 2024 20:25:09 +0300 Subject: [PATCH] Fix a few lifetime-related clippy warnings. Found by nightly toolchain. --- src/db.rs | 6 +++--- src/index.rs | 2 +- src/status.rs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/db.rs b/src/db.rs index 07e9f9d..414504c 100644 --- a/src/db.rs +++ b/src/db.rs @@ -239,8 +239,8 @@ impl DBStore { self.iter_prefix_cf(self.txid_cf(), prefix) } - fn iter_cf<'a, const N: usize>( - &'a self, + fn iter_cf( + &self, cf: &rocksdb::ColumnFamily, readopts: rocksdb::ReadOptions, prefix: Option, @@ -385,7 +385,7 @@ impl<'a, const N: usize> DBIterator<'a, N> { } } -impl<'a, const N: usize> Iterator for DBIterator<'a, N> { +impl Iterator for DBIterator<'_, N> { type Item = [u8; N]; fn next(&mut self) -> Option { diff --git a/src/index.rs b/src/index.rs index 5a22dc6..758eede 100644 --- a/src/index.rs +++ b/src/index.rs @@ -246,7 +246,7 @@ fn index_single_block( height: usize, } - impl<'a> Visitor for IndexBlockVisitor<'a> { + impl Visitor for IndexBlockVisitor<'_> { fn visit_transaction(&mut self, tx: &bsl::Transaction) -> ControlFlow<()> { let txid = bsl_txid(tx); self.batch diff --git a/src/status.rs b/src/status.rs index 41115b3..0282f09 100644 --- a/src/status.rs +++ b/src/status.rs @@ -240,7 +240,7 @@ impl ScriptHashStatus { fn confirmed_height_entries<'a>( &'a self, chain: &'a Chain, - ) -> impl Iterator + 'a { + ) -> impl Iterator + 'a { self.confirmed .iter() .filter_map(move |(blockhash, entries)| { @@ -252,7 +252,7 @@ impl ScriptHashStatus { /// Iterate through confirmed TxEntries. /// Skip entries from stale blocks. - fn confirmed_entries<'a>(&'a self, chain: &'a Chain) -> impl Iterator + 'a { + fn confirmed_entries<'a>(&'a self, chain: &'a Chain) -> impl Iterator + 'a { self.confirmed_height_entries(chain) .flat_map(|(_height, entries)| entries) } @@ -565,7 +565,7 @@ fn filter_block_txs_inputs( pos: usize, } - impl<'a> Visitor for FindInputs<'a> { + impl Visitor for FindInputs<'_> { fn visit_transaction(&mut self, tx: &bsl::Transaction) -> ControlFlow<()> { if !self.buffer.is_empty() { let result = std::mem::take(&mut self.buffer);