build: address clippy issues from 1.84 (#2444)

Author: jouho

dc/s2n-quic-dc/src/fixed_map.rs

@@ -204,7 +204,7 @@ where
         // Scan each value and check if our requested needle is present.
         let values = self.values.read();
         for (value_idx, value) in values.iter().enumerate() {
-            if value.as_ref().map_or(false, |(k, _)| *k == *needle) {
+            if value.as_ref().is_some_and(|(k, _)| *k == *needle) {
                 return Some(RwLockReadGuard::map(values, |values| {
                     &values[value_idx].as_ref().unwrap().1
                 }));

dc/s2n-quic-dc/src/packet/stream/decoder.rs

@@ -198,7 +198,7 @@ impl Packet<'_> {
                 let len = VarInt::try_from(self.payload.len()).ok()?;
                 offset.checked_sub(len)
             })
-            .map_or(false, |v| *v == 0)
+            .is_some_and(|v| *v == 0)
     }
 
     #[inline]

dc/s2n-quic-dc/src/stream/send/application/state.rs

@@ -115,9 +115,9 @@ impl State {
 
                 let has_more_app_data = credits.initial_len > total_payload_len;
 
-                let included_fin = reader.final_offset().map_or(false, |fin| {
-                    stream_offset.as_u64() + payload_len as u64 == fin.as_u64()
-                });
+                let included_fin = reader
+                    .final_offset()
+                    .is_some_and(|fin| stream_offset.as_u64() + payload_len as u64 == fin.as_u64());
 
                 let time_sent = clock.get_time();
                 probes::on_transmit_stream(

quic/s2n-quic-core/src/buffer/reader.rs

@@ -31,7 +31,7 @@ pub trait Reader: Storage {
     /// Returns `true` if the reader has the final offset buffered
     #[inline]
     fn has_buffered_fin(&self) -> bool {
-        self.final_offset().map_or(false, |fin| {
+        self.final_offset().is_some_and(|fin| {
             let buffered_end = self
                 .current_offset()
                 .as_u64()
@@ -44,7 +44,7 @@ pub trait Reader: Storage {
     #[inline]
     fn is_consumed(&self) -> bool {
         self.final_offset()
-            .map_or(false, |fin| fin == self.current_offset())
+            .is_some_and(|fin| fin == self.current_offset())
     }
 
     /// Skips the data in the reader until `offset` is reached, or the reader storage is exhausted.

quic/s2n-quic-core/src/buffer/reassembler.rs

@@ -127,14 +127,13 @@ impl Reassembler {
     #[inline]
     pub fn is_writing_complete(&self) -> bool {
         self.final_size()
-            .map_or(false, |len| self.total_received_len() == len)
+            .is_some_and(|len| self.total_received_len() == len)
     }
 
     /// Returns true if the buffer has completely been read and the final size is known
     #[inline]
     pub fn is_reading_complete(&self) -> bool {
-        self.final_size()
-            .map_or(false, |len| self.cursors.start_offset == len)
+        self.final_size() == Some(self.cursors.start_offset)
     }
 
     /// Returns the final size of the stream, if known

quic/s2n-quic-core/src/buffer/reassembler/reader.rs

@@ -40,7 +40,7 @@ impl Storage for Reassembler {
         );
 
         // if we have a final size and this slot overlaps it then return the entire thing
-        let chunk = if self.cursors.final_size().map_or(false, |final_size| {
+        let chunk = if self.cursors.final_size().is_some_and(|final_size| {
             final_size <= slot.end_allocated() && watermark >= slot.buffered_len()
         }) {
             slot.consume()

quic/s2n-quic-core/src/recovery/bandwidth/estimator.rs

@@ -347,7 +347,7 @@ impl Estimator {
             |app_limited_bytes| self.delivered_bytes > app_limited_bytes;
         if self
             .app_limited_delivered_bytes
-            .map_or(false, is_app_limited_period_over)
+            .is_some_and(is_app_limited_period_over)
         {
             // Clear app-limited field if bubble is ACKed and gone
             self.app_limited_delivered_bytes = None;

quic/s2n-quic-core/src/recovery/bbr/probe_bw.rs

@@ -297,7 +297,7 @@ impl State {
         //#   return Now() > BBR.cycle_stamp + interval
 
         self.cycle_start_timestamp
-            .map_or(false, |cycle_stamp| now > cycle_stamp + interval)
+            .is_some_and(|cycle_stamp| now > cycle_stamp + interval)
     }
 
     /// Bandwidth probing can cause loss. To help coexistence with loss-based

quic/s2n-quic-core/src/recovery/bbr/windowed_filter.rs

@@ -84,9 +84,8 @@ impl<
 
     #[inline]
     fn window_expired(&self, now: TimeType) -> bool {
-        self.last_updated.map_or(false, |last_updated| {
-            now - last_updated >= self.window_length
-        })
+        self.last_updated
+            .is_some_and(|last_updated| now - last_updated >= self.window_length)
     }
 }
 //= https://tools.ietf.org/id/draft-cardwell-iccrg-bbr-congestion-control-02#4.5.3.2

quic/s2n-quic-core/src/recovery/persistent_congestion.rs

@@ -46,7 +46,7 @@ impl Calculator {
         //# potentially too few probes.
         ensure!(self
             .first_rtt_sample
-            .map_or(false, |ts| packet_info.time_sent >= ts));
+            .is_some_and(|ts| packet_info.time_sent >= ts));
 
         // Check that this lost packet was sent on the same path
         //