ci: Fix Clippy (#2482)

maddeleine · web-flow · commit 17b5ff261f5b · 2025-02-24T16:31:07.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ mod tests {`
`132`	`132`	`] {`
`133`	`133`	`assert_eq!(`
`134`	`134`	`*ecn,`
`135`		`- ExplicitCongestionNotification::new(i << 2 \| *ecn as u8)`
	`135`	`+ ExplicitCongestionNotification::new((i << 2) \| *ecn as u8)`
`136`	`136`	`);`
`137`	`137`	`}`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ impl Vihl {`
`529`	`529`
`530`	`530`	`#[inline]`
`531`	`531`	`pub fn set_version(&mut self, value: u8) -> &mut Self {`
`532`		`- self.value = value << 4 \| (self.value & 0x0F);`
	`532`	`+ self.value = (value << 4) \| (self.value & 0x0F);`
`533`	`533`	`self`
`534`	`534`	`}`
`535`	`535`
Original file line number	Diff line number	Diff line change
`@@ -536,13 +536,13 @@ impl Vtcfl {`
`536`	`536`
`537`	`537`	`#[inline]`
`538`	`538`	`pub fn set_version(&mut self, version: u8) -> &mut Self {`
`539`		`- self.octets[0] = version << 4 \| self.octets[0] & 0x0F;`
	`539`	`+ self.octets[0] = (version << 4) \| self.octets[0] & 0x0F;`
`540`	`540`	`self`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`#[inline]`
`544`	`544`	`pub fn dscp(&self) -> u8 {`
`545`		`- let value = self.octets[0] << 4 \| self.octets[1] >> 4;`
	`545`	`+ let value = (self.octets[0] << 4) \| (self.octets[1] >> 4);`
`546`	`546`	`value >> 2`
`547`	`547`	`}`
`548`	`548`
`@@ -556,12 +556,12 @@ impl Vtcfl {`
`556`	`556`
`557`	`557`	`#[inline]`
`558`	`558`	`pub fn ecn(&self) -> ExplicitCongestionNotification {`
`559`		`- ExplicitCongestionNotification::new(self.octets[1] >> 4 & 0b11)`
	`559`	`+ ExplicitCongestionNotification::new((self.octets[1] >> 4) & 0b11)`
`560`	`560`	`}`
`561`	`561`
`562`	`562`	`#[inline]`
`563`	`563`	`pub fn set_ecn(&mut self, ecn: ExplicitCongestionNotification) -> &mut Self {`
`564`		`- self.octets[1] = (self.octets[1] & !(0b11 << 4)) \| (ecn as u8) << 4;`
	`564`	`+ self.octets[1] = (self.octets[1] & !(0b11 << 4)) \| ((ecn as u8) << 4);`
`565`	`565`	`self`
`566`	`566`	`}`
`567`	`567`
Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,11 @@ pub enum PacketType {`
`143`	`143`
`144`	`144`	`impl PacketType {`
`145`	`145`	`pub const fn into_bits(self) -> u8 {`
`146`		`- (self as u8) << PACKET_TYPE_OFFSET & PACKET_TYPE_MASK`
	`146`	`+ ((self as u8) << PACKET_TYPE_OFFSET) & PACKET_TYPE_MASK`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`pub fn from_bits(bits: u8) -> Self {`
`150`		`- (bits & PACKET_TYPE_MASK >> PACKET_TYPE_OFFSET).into()`
	`150`	`+ (bits & (PACKET_TYPE_MASK >> PACKET_TYPE_OFFSET)).into()`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`