fix clippy/fmt

Author: yngrtc

dtls/examples/hub/src/utilities.rs

@@ -107,7 +107,7 @@ pub fn load_certificate(path: PathBuf) -> Result<Vec<CertificateDer<'static>>, E
 
     let mut reader = BufReader::new(f);
     match rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>() {
-        Ok(certs) => Ok(certs.into_iter().map(CertificateDer::from).collect()),
+        Ok(certs) => Ok(certs.into_iter().collect()),
         Err(_) => Err(Error::ErrNoCertificateFound),
     }
 }

ice/src/udp_mux/mod.rs

@@ -329,10 +329,6 @@ impl UDPMuxWriter for UDPMuxDefault {
     }
 
     async fn send_to(&self, buf: &[u8], target: &SocketAddr) -> Result<usize, Error> {
-        self.params
-            .conn
-            .send_to(buf, *target)
-            .await
-            .map_err(Into::into)
+        self.params.conn.send_to(buf, *target).await
     }
 }

media/src/io/ogg_writer/ogg_writer_test.rs

@@ -58,7 +58,7 @@ fn test_ogg_writer_add_packet_and_close() -> Result<()> {
 
 #[test]
 fn test_ogg_writer_add_packet() -> Result<()> {
-    let raw_pkt = Bytes::from_iter(std::iter::repeat(0x45).take(235));
+    let raw_pkt = Bytes::from_iter(std::iter::repeat_n(0x45, 235));
 
     let mut valid_packet = rtp::packet::Packet {
         header: rtp::header::Header {
@@ -99,7 +99,7 @@ fn test_ogg_writer_add_packet() -> Result<()> {
 
 #[test]
 fn test_ogg_writer_add_packet_of_255() -> Result<()> {
-    let raw_pkt = Bytes::from_iter(std::iter::repeat(0x45).take(255));
+    let raw_pkt = Bytes::from_iter(std::iter::repeat_n(0x45, 255));
 
     let mut valid_packet = rtp::packet::Packet {
         header: rtp::header::Header {
@@ -140,7 +140,7 @@ fn test_ogg_writer_add_packet_of_255() -> Result<()> {
 
 #[test]
 fn test_ogg_writer_add_large_packet() -> Result<()> {
-    let raw_pkt = Bytes::from_iter(std::iter::repeat(0x45).take(1000));
+    let raw_pkt = Bytes::from_iter(std::iter::repeat_n(0x45, 1000));
 
     let mut valid_packet = rtp::packet::Packet {
         header: rtp::header::Header {
@@ -181,7 +181,7 @@ fn test_ogg_writer_add_large_packet() -> Result<()> {
 
 #[test]
 fn test_ogg_writer_add_large_packet_with_multiple_of_255() -> Result<()> {
-    let raw_pkt = Bytes::from_iter(std::iter::repeat(0x45).take(255 * 4));
+    let raw_pkt = Bytes::from_iter(std::iter::repeat_n(0x45, 255 * 4));
 
     let mut valid_packet = rtp::packet::Packet {
         header: rtp::header::Header {

rtp/src/header.rs

@@ -208,7 +208,7 @@ impl MarshalSize for Header {
         let mut head_size = 12 + (self.csrc.len() * CSRC_LENGTH);
         if self.extension {
             let extension_payload_len = self.get_extension_payload_len() + self.extensions_padding;
-            let extension_payload_size = (extension_payload_len + 3) / 4;
+            let extension_payload_size = extension_payload_len.div_ceil(4);
             head_size += 4 + extension_payload_size * 4;
         }
         head_size
@@ -275,7 +275,7 @@ impl Marshal for Header {
                 //the payload must be in 32-bit words.
                 return Err(Error::HeaderExtensionPayloadNot32BitWords.into());
             }
-            let extension_payload_size = (extension_payload_len as u16 + 3) / 4;
+            let extension_payload_size = (extension_payload_len as u16).div_ceil(4);
             buf.put_u16(extension_payload_size);
 
             match self.extension_profile {

sctp/src/association/association_internal.rs

@@ -1264,7 +1264,7 @@ impl AssociationInternal {
             //      most, the lesser of 1) the total size of the previously
             //      outstanding DATA chunk(s) acknowledged, and 2) the destination's
             //      path MTU.
-            if !self.in_fast_recovery && self.pending_queue.len() > 0 {
+            if !self.in_fast_recovery && !self.pending_queue.is_empty() {
                 self.cwnd += std::cmp::min(total_bytes_acked as u32, self.cwnd); // TCP way
                                                                                  // self.cwnd += min32(uint32(total_bytes_acked), self.mtu) // SCTP way (slow)
                 log::trace!(
@@ -1299,7 +1299,7 @@ impl AssociationInternal {
             //      of data outstanding (i.e., before arrival of the SACK, flight size
             //      was greater than or equal to cwnd), increase cwnd by MTU, and
             //      reset partial_bytes_acked to (partial_bytes_acked - cwnd).
-            if self.partial_bytes_acked >= self.cwnd && self.pending_queue.len() > 0 {
+            if self.partial_bytes_acked >= self.cwnd && !self.pending_queue.is_empty() {
                 self.partial_bytes_acked -= self.cwnd;
                 self.cwnd += self.mtu;
                 log::trace!(
@@ -1905,7 +1905,7 @@ impl AssociationInternal {
         let mut chunks = vec![];
         let mut sis_to_reset = vec![]; // stream identifiers to reset
 
-        if self.pending_queue.len() == 0 {
+        if self.pending_queue.is_empty() {
             return (chunks, sis_to_reset);
         }
 

sctp/src/association/association_test.rs

@@ -289,6 +289,12 @@ async fn test_assoc_reliable_simple() -> Result<()> {
 
 //use std::io::Write;
 
+fn fill(buf: &mut [u8]) {
+    for i in 0..buf.len() {
+        buf[i] = (i & 0xff) as u8;
+    }
+}
+
 // NB: This is ignored on Windows due to flakiness with timing/IO interactions.
 // TODO: Refactor this and other tests that are disabled for similar reason to not have such issues
 #[cfg(not(target_os = "windows"))]
@@ -311,13 +317,9 @@ async fn test_assoc_reliable_ordered_reordered() -> Result<()> {
 
     const SI: u16 = 2;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf);
     let mut sbufl = vec![0u8; 2000];
-    for i in 0..sbufl.len() {
-        sbufl[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbufl);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -406,13 +408,9 @@ async fn test_assoc_reliable_ordered_fragmented_then_defragmented() -> Result<()
 
     const SI: u16 = 3;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf);
     let mut sbufl = vec![0u8; 2000];
-    for i in 0..sbufl.len() {
-        sbufl[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbufl);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -473,13 +471,9 @@ async fn test_assoc_reliable_unordered_fragmented_then_defragmented() -> Result<
 
     const SI: u16 = 4;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf);
     let mut sbufl = vec![0u8; 2000];
-    for i in 0..sbufl.len() {
-        sbufl[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbufl);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -540,13 +534,9 @@ async fn test_assoc_reliable_unordered_ordered() -> Result<()> {
 
     const SI: u16 = 5;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf);
     let mut sbufl = vec![0u8; 2000];
-    for i in 0..sbufl.len() {
-        sbufl[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbufl);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -785,9 +775,7 @@ async fn test_assoc_unreliable_rexmit_ordered_no_fragment() -> Result<()> {
 
     const SI: u16 = 1;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -870,9 +858,7 @@ async fn test_assoc_unreliable_rexmit_ordered_fragment() -> Result<()> {
 
     const SI: u16 = 1;
     let mut sbuf = vec![0u8; 2000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -960,9 +946,7 @@ async fn test_assoc_unreliable_rexmit_unordered_no_fragment() -> Result<()> {
 
     const SI: u16 = 2;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -1048,9 +1032,7 @@ async fn test_assoc_unreliable_rexmit_unordered_fragment() -> Result<()> {
 
     const SI: u16 = 1;
     let mut sbuf = vec![0u8; 2000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -1143,9 +1125,7 @@ async fn test_assoc_unreliable_rexmit_timed_ordered() -> Result<()> {
 
     const SI: u16 = 3;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -1228,9 +1208,7 @@ async fn test_assoc_unreliable_rexmit_timed_unordered() -> Result<()> {
 
     const SI: u16 = 3;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -1331,9 +1309,7 @@ async fn test_assoc_congestion_control_fast_retransmission() -> Result<()> {
 
     const SI: u16 = 6;
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -1425,9 +1401,7 @@ async fn test_assoc_congestion_control_congestion_avoidance() -> Result<()> {
     const N_PACKETS_TO_SEND: u32 = 2000;
 
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -1567,9 +1541,7 @@ async fn test_assoc_congestion_control_slow_reader() -> Result<()> {
     const N_PACKETS_TO_SEND: u32 = 130;
 
     let mut sbuf = vec![0u8; 1000];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 
@@ -1696,9 +1668,8 @@ async fn test_assoc_delayed_ack() -> Result<()> {
     const SI: u16 = 6;
     let mut sbuf = vec![0u8; 1000];
     let mut rbuf = vec![0u8; 1500];
-    for i in 0..sbuf.len() {
-        sbuf[i] = (i & 0xff) as u8;
-    }
+    fill(&mut sbuf[..]);
+    fill(&mut rbuf[..]);
 
     let (br, ca, cb) = Bridge::new(0, None, None);
 

sdp/src/description/media.rs

@@ -192,10 +192,7 @@ impl MediaDescription {
         let uri = {
             let m = ext_map_uri();
             if let Some(uri_str) = m.get(&EXT_MAP_VALUE_TRANSPORT_CC_KEY) {
-                match Url::parse(uri_str) {
-                    Ok(uri) => Some(uri),
-                    Err(_) => None,
-                }
+                Url::parse(uri_str).ok()
             } else {
                 None
             }

stun/src/message/message_test.rs

@@ -733,10 +733,7 @@ fn test_message_marshal_binary() -> Result<()> {
     m.unmarshal_binary(&data)?;
 
     // Reset data to check retention.
-    #[allow(clippy::needless_range_loop)]
-    for i in 0..data.len() {
-        data[i] = 0;
-    }
+    data.fill(0);
 
     m.decode()?;
 

turn/src/server/mod.rs

@@ -101,12 +101,12 @@ impl Server {
     /// Get information of [`Allocation`][`Allocation`]s by specified [`FiveTuple`]s.
     ///
     /// If `five_tuples` is:
-    /// - [`None`]:               It returns information about the all
-    ///                           [`Allocation`][`Allocation`]s.
+    /// - [`None`]: It returns information about the all
+    ///   [`Allocation`][`Allocation`]s.
     /// - [`Some`] and not empty: It returns information about
-    ///                           the [`Allocation`][`Allocation`]s associated with
-    ///                           the specified [`FiveTuples`].
-    /// - [`Some`], but empty:    It returns an empty [`HashMap`].
+    ///   the [`Allocation`][`Allocation`]s associated with
+    ///   the specified [`FiveTuples`].
+    /// - [`Some`], but empty: It returns an empty [`HashMap`].
     ///
     /// [`Allocation`]: crate::allocation::Allocation
     pub async fn get_allocations_info(

util/src/fixed_big_int/mod.rs

@@ -23,7 +23,7 @@ impl fmt::Display for FixedBigInt {
 
 impl FixedBigInt {
     pub(crate) fn new(n: usize) -> Self {
-        let mut chunk_size = (n + 63) / 64;
+        let mut chunk_size = n.div_ceil(64);
         if chunk_size == 0 {
             chunk_size = 1;
         }