diff --git a/zebra-network/src/address_book.rs b/zebra-network/src/address_book.rs index e2f4437d..69e97430 100644 --- a/zebra-network/src/address_book.rs +++ b/zebra-network/src/address_book.rs @@ -140,14 +140,14 @@ impl AddressBook { /// Return an iterator over all peers, ordered from most recently seen to /// least recently seen. - pub fn peers<'a>(&'a self) -> impl Iterator + 'a { + pub fn peers(&'_ self) -> impl Iterator + '_ { let _guard = self.span.enter(); self.by_time.iter().rev().cloned() } /// Return an iterator over peers known to be disconnected, ordered from most /// recently seen to least recently seen. - pub fn disconnected_peers<'a>(&'a self) -> impl Iterator + 'a { + pub fn disconnected_peers(&'_ self) -> impl Iterator + '_ { let _guard = self.span.enter(); use std::ops::Bound::{Excluded, Unbounded}; @@ -159,7 +159,7 @@ impl AddressBook { /// Return an iterator over peers that could potentially be connected, ordered from most /// recently seen to least recently seen. - pub fn potentially_connected_peers<'a>(&'a self) -> impl Iterator + 'a { + pub fn potentially_connected_peers(&'_ self) -> impl Iterator + '_ { let _guard = self.span.enter(); use std::ops::Bound::{Included, Unbounded}; @@ -171,7 +171,7 @@ impl AddressBook { /// Returns an iterator that drains entries from the address book, removing /// them in order from most recent to least recent. - pub fn drain_newest<'a>(&'a mut self) -> impl Iterator + 'a { + pub fn drain_newest(&'_ mut self) -> impl Iterator + '_ { Drain { book: self, newest_first: true, @@ -180,7 +180,7 @@ impl AddressBook { /// Returns an iterator that drains entries from the address book, removing /// them in order from least recent to most recent. - pub fn drain_oldest<'a>(&'a mut self) -> impl Iterator + 'a { + pub fn drain_oldest(&'_ mut self) -> impl Iterator + '_ { Drain { book: self, newest_first: false, diff --git a/zebra-network/src/peer/connection.rs b/zebra-network/src/peer/connection.rs index dc6bd38c..c2533b28 100644 --- a/zebra-network/src/peer/connection.rs +++ b/zebra-network/src/peer/connection.rs @@ -726,9 +726,7 @@ where } } -fn transaction_hashes<'a>( - items: &'a [InventoryHash], -) -> impl Iterator + 'a { +fn transaction_hashes(items: &'_ [InventoryHash]) -> impl Iterator + '_ { items.iter().filter_map(|item| { if let InventoryHash::Tx(hash) = item { Some(*hash) @@ -738,7 +736,7 @@ fn transaction_hashes<'a>( }) } -fn block_hashes<'a>(items: &'a [InventoryHash]) -> impl Iterator + 'a { +fn block_hashes(items: &'_ [InventoryHash]) -> impl Iterator + '_ { items.iter().filter_map(|item| { if let InventoryHash::Block(hash) = item { Some(*hash)