From 17b5ff261f5b5a42ea7b21520845d7a4aa40ccd8 Mon Sep 17 00:00:00 2001
From: maddeleine <59030281+maddeleine@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:31:07 -0800
Subject: [PATCH] ci: Fix Clippy (#2482)

---
 examples/rustls-mtls/src/lib.rs                  | 7 ++-----
 quic/s2n-quic-core/src/inet/ecn.rs               | 2 +-
 quic/s2n-quic-core/src/inet/ipv4.rs              | 2 +-
 quic/s2n-quic-core/src/inet/ipv6.rs              | 8 ++++----
 quic/s2n-quic-core/src/packet/long.rs            | 4 ++--
 quic/s2n-quic-core/src/packet/stateless_reset.rs | 2 +-
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/examples/rustls-mtls/src/lib.rs b/examples/rustls-mtls/src/lib.rs
index 029aba2d5a..f35b3dee16 100644
--- a/examples/rustls-mtls/src/lib.rs
+++ b/examples/rustls-mtls/src/lib.rs
@@ -96,7 +96,7 @@ impl MtlsProvider {
         let private_key = into_private_key(my_key_pem.as_ref()).await?;
         Ok(MtlsProvider {
             root_store,
-            my_cert_chain: cert_chain.into_iter().map(CertificateDer::from).collect(),
+            my_cert_chain: cert_chain,
             my_private_key: private_key,
         })
     }
@@ -124,10 +124,7 @@ async fn into_certificate(path: &Path) -> Result<Vec<CertificateDer<'static>>, R
 }
 
 async fn into_root_store(path: &Path) -> Result<RootCertStore, RustlsError> {
-    let ca_certs: Vec<CertificateDer<'static>> = into_certificate(path)
-        .await
-        .map(|certs| certs.into_iter().map(CertificateDer::from))?
-        .collect();
+    let ca_certs: Vec<CertificateDer<'static>> = into_certificate(path).await?;
     let mut cert_store = RootCertStore::empty();
     cert_store.add_parsable_certificates(ca_certs);
     Ok(cert_store)
diff --git a/quic/s2n-quic-core/src/inet/ecn.rs b/quic/s2n-quic-core/src/inet/ecn.rs
index c57a62b4ac..b3caf1d1de 100644
--- a/quic/s2n-quic-core/src/inet/ecn.rs
+++ b/quic/s2n-quic-core/src/inet/ecn.rs
@@ -132,7 +132,7 @@ mod tests {
             ] {
                 assert_eq!(
                     *ecn,
-                    ExplicitCongestionNotification::new(i << 2 | *ecn as u8)
+                    ExplicitCongestionNotification::new((i << 2) | *ecn as u8)
                 );
             }
         }
diff --git a/quic/s2n-quic-core/src/inet/ipv4.rs b/quic/s2n-quic-core/src/inet/ipv4.rs
index 8ea3d0b94d..fd5d3a5267 100644
--- a/quic/s2n-quic-core/src/inet/ipv4.rs
+++ b/quic/s2n-quic-core/src/inet/ipv4.rs
@@ -529,7 +529,7 @@ impl Vihl {
 
     #[inline]
     pub fn set_version(&mut self, value: u8) -> &mut Self {
-        self.value = value << 4 | (self.value & 0x0F);
+        self.value = (value << 4) | (self.value & 0x0F);
         self
     }
 
diff --git a/quic/s2n-quic-core/src/inet/ipv6.rs b/quic/s2n-quic-core/src/inet/ipv6.rs
index d2ed7870bc..7b011fe9b2 100644
--- a/quic/s2n-quic-core/src/inet/ipv6.rs
+++ b/quic/s2n-quic-core/src/inet/ipv6.rs
@@ -536,13 +536,13 @@ impl Vtcfl {
 
     #[inline]
     pub fn set_version(&mut self, version: u8) -> &mut Self {
-        self.octets[0] = version << 4 | self.octets[0] & 0x0F;
+        self.octets[0] = (version << 4) | self.octets[0] & 0x0F;
         self
     }
 
     #[inline]
     pub fn dscp(&self) -> u8 {
-        let value = self.octets[0] << 4 | self.octets[1] >> 4;
+        let value = (self.octets[0] << 4) | (self.octets[1] >> 4);
         value >> 2
     }
 
@@ -556,12 +556,12 @@ impl Vtcfl {
 
     #[inline]
     pub fn ecn(&self) -> ExplicitCongestionNotification {
-        ExplicitCongestionNotification::new(self.octets[1] >> 4 & 0b11)
+        ExplicitCongestionNotification::new((self.octets[1] >> 4) & 0b11)
     }
 
     #[inline]
     pub fn set_ecn(&mut self, ecn: ExplicitCongestionNotification) -> &mut Self {
-        self.octets[1] = (self.octets[1] & !(0b11 << 4)) | (ecn as u8) << 4;
+        self.octets[1] = (self.octets[1] & !(0b11 << 4)) | ((ecn as u8) << 4);
         self
     }
 
diff --git a/quic/s2n-quic-core/src/packet/long.rs b/quic/s2n-quic-core/src/packet/long.rs
index 514639bf56..8e47534deb 100644
--- a/quic/s2n-quic-core/src/packet/long.rs
+++ b/quic/s2n-quic-core/src/packet/long.rs
@@ -143,11 +143,11 @@ pub enum PacketType {
 
 impl PacketType {
     pub const fn into_bits(self) -> u8 {
-        (self as u8) << PACKET_TYPE_OFFSET & PACKET_TYPE_MASK
+        ((self as u8) << PACKET_TYPE_OFFSET) & PACKET_TYPE_MASK
     }
 
     pub fn from_bits(bits: u8) -> Self {
-        (bits & PACKET_TYPE_MASK >> PACKET_TYPE_OFFSET).into()
+        (bits & (PACKET_TYPE_MASK >> PACKET_TYPE_OFFSET)).into()
     }
 }
 
diff --git a/quic/s2n-quic-core/src/packet/stateless_reset.rs b/quic/s2n-quic-core/src/packet/stateless_reset.rs
index 9d980b3db3..5bab82b47e 100644
--- a/quic/s2n-quic-core/src/packet/stateless_reset.rs
+++ b/quic/s2n-quic-core/src/packet/stateless_reset.rs
@@ -83,7 +83,7 @@ pub fn encode_packet(
         &mut packet_buf[..unpredictable_bits_max_len],
     );
     // Write the short header tag over the first two bits
-    packet_buf[0] = packet_buf[0] >> TAG_OFFSET | TAG;
+    packet_buf[0] = (packet_buf[0] >> TAG_OFFSET) | TAG;
 
     let packet_len = unpredictable_bits_len + stateless_reset::token::LEN;