Merge branch 'quinn-rs:0.11.x' into 0.11.x

Author: LesnyRumcajs

quinn-proto/src/connection/packet_crypto.rs

@@ -88,17 +88,12 @@ pub(super) fn decrypt_packet_body(
         &zero_rtt_crypto.unwrap().packet
     } else if packet_key_phase == conn_key_phase || space != SpaceId::Data {
         &spaces[space].crypto.as_ref().unwrap().packet.remote
-    } else if let Some(prev) = prev_crypto.and_then(|crypto| {
-        // If this packet comes prior to acknowledgment of the key update by the peer,
-        if crypto.end_packet.is_none_or(|(pn, _)| number < pn) {
-            // use the previous keys.
-            Some(crypto)
-        } else {
-            // Otherwise, this must be a remotely-initiated key update, so fall through to the
-            // final case.
-            None
-        }
-    }) {
+    } else if let Some(prev) = prev_crypto.filter(|&crypto|
+        // Use the previous keys if this packet comes prior to acknowledgment of the
+        // key update by the peer; otherwise, this must be a remotely-initiated key
+        // update, so fall through to the final case.
+        crypto.end_packet.is_none_or(|(pn, _)| number < pn))
+    {
         &prev.crypto.remote
     } else {
         // We're in the Data space with a key phase mismatch and either there is no locally

quinn/src/recv_stream.rs

@@ -517,7 +517,7 @@ impl Drop for RecvStream {
                     .blocked_readers
                     .contains_key(&self.stream),
                 "Stream {} should not have a blocked reader when all data read is true",
-                &self.stream
+                self.stream
             );
             return;
         }