chore: apply 1.84 linter suggestions

nymtech · Jan 10, 2025 · 7acac80 · 7acac80
1 parent a94c035
commit 7acac80
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 19 deletions.
diff --git a/common/client-core/src/init/helpers.rs b/common/client-core/src/init/helpers.rs
@@ -190,7 +190,7 @@ where
     Ok(GatewayWithLatency::new(gateway, avg))
 }
 
-pub async fn choose_gateway_by_latency<'a, R: Rng, G: ConnectableGateway + Clone>(
+pub async fn choose_gateway_by_latency<R: Rng, G: ConnectableGateway + Clone>(
     rng: &mut R,
     gateways: &[G],
     must_use_tls: bool,

diff --git a/common/gateway-requests/src/registration/handshake/client.rs b/common/gateway-requests/src/registration/handshake/client.rs
@@ -9,7 +9,7 @@ use futures::{Sink, Stream};
 use rand::{CryptoRng, RngCore};
 use tungstenite::Message as WsMessage;
 
-impl<'a, S, R> State<'a, S, R> {
+impl<S, R> State<'_, S, R> {
     async fn client_handshake_inner(&mut self) -> Result<(), HandshakeError>
     where
         S: Stream<Item = WsItem> + Sink<WsMessage> + Unpin,

diff --git a/common/gateway-requests/src/registration/handshake/gateway.rs b/common/gateway-requests/src/registration/handshake/gateway.rs
@@ -10,7 +10,7 @@ use crate::registration::handshake::{error::HandshakeError, WsItem};
 use futures::{Sink, Stream};
 use tungstenite::Message as WsMessage;
 
-impl<'a, S, R> State<'a, S, R> {
+impl<S, R> State<'_, S, R> {
     async fn gateway_handshake_inner(
         &mut self,
         raw_init_message: Vec<u8>,

diff --git a/common/nym_offline_compact_ecash/src/scheme/aggregation.rs b/common/nym_offline_compact_ecash/src/scheme/aggregation.rs
@@ -115,10 +115,7 @@ pub fn aggregate_signatures(
     let params = ecash_group_parameters();
     // aggregate the signature
 
-    let signature = match Aggregatable::aggregate(signatures, indices) {
-        Ok(res) => res,
-        Err(err) => return Err(err),
-    };
+    let signature = Aggregatable::aggregate(signatures, indices)?;
 
     // Ensure the aggregated signature is not an infinity point
     if bool::from(signature.is_at_infinity()) {

diff --git a/common/statistics/src/clients/packet_statistics.rs b/common/statistics/src/clients/packet_statistics.rs
@@ -428,7 +428,7 @@ impl PacketStatisticsControl {
         while self
             .history
             .front()
-            .map_or(false, |&(t, _)| t < recording_window)
+            .is_some_and(|&(t, _)| t < recording_window)
         {
             self.history.pop_front();
         }
@@ -462,7 +462,7 @@ impl PacketStatisticsControl {
         while self
             .rates
             .front()
-            .map_or(false, |&(t, _)| t < recording_window)
+            .is_some_and(|&(t, _)| t < recording_window)
         {
             self.rates.pop_front();
         }

diff --git a/explorer-api/src/gateways/models.rs b/explorer-api/src/gateways/models.rs
@@ -120,9 +120,7 @@ impl ThreadsafeGatewayCache {
             .read()
             .await
             .get(&identity_key)
-            .map_or(false, |cache_item| {
-                cache_item.valid_until > SystemTime::now()
-            })
+            .is_some_and(|cache_item| cache_item.valid_until > SystemTime::now())
     }
 
     pub(crate) async fn get_locations(&self) -> GatewayLocationCache {

diff --git a/explorer-api/src/mix_nodes/models.rs b/explorer-api/src/mix_nodes/models.rs
@@ -106,9 +106,7 @@ impl ThreadsafeMixNodesCache {
             .read()
             .await
             .get(&mix_id)
-            .map_or(false, |cache_item| {
-                cache_item.valid_until > SystemTime::now()
-            })
+            .is_some_and(|cache_item| cache_item.valid_until > SystemTime::now())
     }
 
     pub(crate) async fn get_locations(&self) -> MixnodeLocationCache {

diff --git a/explorer-api/src/unstable/models.rs b/explorer-api/src/unstable/models.rs
@@ -60,9 +60,7 @@ impl ThreadSafeNymNodesCache {
             .read()
             .await
             .get(&node_id)
-            .map_or(false, |cache_item| {
-                cache_item.valid_until > SystemTime::now()
-            })
+            .is_some_and(|cache_item| cache_item.valid_until > SystemTime::now())
     }
 
     pub(crate) async fn get_bonded_nymnodes(

diff --git a/nym-credential-proxy/nym-credential-proxy/src/http/state/mod.rs b/nym-credential-proxy/nym-credential-proxy/src/http/state/mod.rs
@@ -710,7 +710,7 @@ pub(crate) struct ChainWritePermit<'a> {
     inner: RwLockWriteGuard<'a, DirectSigningHttpRpcNyxdClient>,
 }
 
-impl<'a> ChainWritePermit<'a> {
+impl ChainWritePermit<'_> {
     pub(crate) async fn make_deposits(
         self,
         short_sha: &'static str,