format

freenet · Dec 26, 2024 · 6ead963 · 6ead963
1 parent 29c67e8
commit 6ead963
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/crates/core/src/transport/connection_handler.rs b/crates/core/src/transport/connection_handler.rs
@@ -2,22 +2,21 @@ use std::collections::BTreeMap;
 
 type GatewayConnectionFuture = Box<
     dyn Future<
-        Output = Result<
-            (
-                RemoteConnection,
-                InboundRemoteConnection,
-                PacketData<SymmetricAES>,
-            ),
-            TransportError,
-        >,
-    > + Send
+            Output = Result<
+                (
+                    RemoteConnection,
+                    InboundRemoteConnection,
+                    PacketData<SymmetricAES>,
+                ),
+                TransportError,
+            >,
+        > + Send
         + 'static,
 >;
 
 type TraverseNatFuture = Box<
-    dyn Future<
-        Output = Result<(RemoteConnection, InboundRemoteConnection), TransportError>,
-    > + Send
+    dyn Future<Output = Result<(RemoteConnection, InboundRemoteConnection), TransportError>>
+        + Send
         + 'static,
 >;
 use std::net::{IpAddr, SocketAddr};
@@ -397,7 +396,10 @@ impl<S: Socket> UdpPacketsListener<S> {
         &mut self,
         remote_intro_packet: PacketData<UnknownEncryption>,
         remote_addr: SocketAddr,
-    ) -> (GatewayConnectionFuture, mpsc::Sender<PacketData<UnknownEncryption>>) {
+    ) -> (
+        GatewayConnectionFuture,
+        mpsc::Sender<PacketData<UnknownEncryption>>,
+    ) {
         let secret = self.this_peer_keypair.secret.clone();
         let outbound_packets = self.outbound_packets.clone();
 
@@ -516,7 +518,10 @@ impl<S: Socket> UdpPacketsListener<S> {
         &mut self,
         remote_addr: SocketAddr,
         remote_public_key: TransportPublicKey,
-    ) -> (TraverseNatFuture, mpsc::Sender<PacketData<UnknownEncryption>>) {
+    ) -> (
+        TraverseNatFuture,
+        mpsc::Sender<PacketData<UnknownEncryption>>,
+    ) {
         // Constants for exponential backoff
         const INITIAL_TIMEOUT: Duration = Duration::from_millis(15);
         const TIMEOUT_MULTIPLIER: f64 = 1.2;

diff --git a/crates/core/src/transport/rate_limiter.rs b/crates/core/src/transport/rate_limiter.rs
@@ -66,7 +66,7 @@ impl<T: TimeSource> PacketRateLimiter<T> {
         while self
             .packets
             .front()
-            .map_or(false, |&(_, time)| now - time > self.window_size)
+            .is_some_and(|&(_, time)| now - time > self.window_size)
         {
             let expired = self.packets.pop_front();
             if let Some((size, _)) = expired {

diff --git a/crates/core/src/transport/received_packet_tracker.rs b/crates/core/src/transport/received_packet_tracker.rs
@@ -88,7 +88,7 @@ impl<T: TimeSource> ReceivedPacketTracker<T> {
         while self
             .packet_id_time
             .front()
-            .map_or(false, |&(_, time)| time < remove_before)
+            .is_some_and(|&(_, time)| time < remove_before)
         {
             let expired = self.packet_id_time.pop_front();
             if let Some((packet_id, _)) = expired {