fix clippy and fmt

yngrtc · yngrtc · commit ffead9f7858b · 2025-01-26T12:48:48.000-08:00
diff --git a/dtls/src/extension/extension_server_name.rs b/dtls/src/extension/extension_server_name.rs
@@ -21,7 +21,7 @@ impl ExtensionServerName {
 
     pub fn size(&self) -> usize {
         //TODO: check how to do cryptobyte?
-        2 + 2 + 1 + 2 + self.server_name.as_bytes().len()
+        2 + 2 + 1 + 2 + self.server_name.len()
     }
 
     pub fn marshal<W: Write>(&self, writer: &mut W) -> Result<()> {
diff --git a/ice/src/agent/agent_internal.rs b/ice/src/agent/agent_internal.rs
@@ -984,7 +984,7 @@ impl AgentInternal {
     ) -> bool {
         self.find_remote_candidate(local.network_type(), remote)
             .await
-            .map_or(false, |remote_candidate| {
+            .is_some_and(|remote_candidate| {
                 remote_candidate.seen(false);
                 true
             })
diff --git a/ice/src/agent/agent_test.rs b/ice/src/agent/agent_test.rs
@@ -1599,8 +1599,8 @@ async fn test_agent_credentials() -> Result<()> {
     let a = Agent::new(AgentConfig::default()).await?;
     {
         let ufrag_pwd = a.internal.ufrag_pwd.lock().await;
-        assert!(ufrag_pwd.local_ufrag.as_bytes().len() * 8 >= 24);
-        assert!(ufrag_pwd.local_pwd.as_bytes().len() * 8 >= 128);
+        assert!(ufrag_pwd.local_ufrag.len() * 8 >= 24);
+        assert!(ufrag_pwd.local_pwd.len() * 8 >= 128);
     }
     a.close().await?;
 
diff --git a/ice/src/agent/agent_vnet_test.rs b/ice/src/agent/agent_vnet_test.rs
@@ -1002,7 +1002,7 @@ async fn test_write_use_valid_pair() -> Result<(), Error> {
     log::debug!("controlled_agent start_connectivity_checks done...");
 
     let test_message = "Test Message";
-    let mut read_buf = vec![0u8; test_message.as_bytes().len()];
+    let mut read_buf = vec![0u8; test_message.len()];
     controlled_agent_conn.recv(&mut read_buf).await?;
 
     assert_eq!(read_buf, test_message.as_bytes(), "should match");
diff --git a/mdns/src/message/resource/txt.rs b/mdns/src/message/resource/txt.rs
@@ -43,7 +43,7 @@ impl ResourceBody for TxtResource {
             let (t, new_off) = unpack_str(msg, off)?;
             off = new_off;
             // Check if we got too many bytes.
-            if length < n + t.as_bytes().len() + 1 {
+            if length < n + t.len() + 1 {
                 return Err(Error::ErrCalcLen);
             }
             n += t.len() + 1;
diff --git a/rtcp/src/compound_packet/mod.rs b/rtcp/src/compound_packet/mod.rs
@@ -66,10 +66,7 @@ impl Packet for CompoundPacket {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<CompoundPacket>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<CompoundPacket>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/extended_report/dlrr.rs b/rtcp/src/extended_report/dlrr.rs
@@ -77,10 +77,7 @@ impl Packet for DLRRReportBlock {
         self
     }
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<DLRRReportBlock>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<DLRRReportBlock>() == Some(self)
     }
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
diff --git a/rtcp/src/extended_report/mod.rs b/rtcp/src/extended_report/mod.rs
@@ -199,10 +199,7 @@ impl Packet for ExtendedReport {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<ExtendedReport>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<ExtendedReport>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/extended_report/prt.rs b/rtcp/src/extended_report/prt.rs
@@ -71,7 +71,7 @@ impl Packet for PacketReceiptTimesReportBlock {
         other
             .as_any()
             .downcast_ref::<PacketReceiptTimesReportBlock>()
-            .map_or(false, |a| self == a)
+            == Some(self)
     }
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
diff --git a/rtcp/src/extended_report/rle.rs b/rtcp/src/extended_report/rle.rs
@@ -163,10 +163,7 @@ impl Packet for RLEReportBlock {
         self
     }
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<RLEReportBlock>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<RLEReportBlock>() == Some(self)
     }
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
diff --git a/rtcp/src/extended_report/rrt.rs b/rtcp/src/extended_report/rrt.rs
@@ -56,7 +56,7 @@ impl Packet for ReceiverReferenceTimeReportBlock {
         other
             .as_any()
             .downcast_ref::<ReceiverReferenceTimeReportBlock>()
-            .map_or(false, |a| self == a)
+            == Some(self)
     }
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
diff --git a/rtcp/src/extended_report/ssr.rs b/rtcp/src/extended_report/ssr.rs
@@ -132,7 +132,7 @@ impl Packet for StatisticsSummaryReportBlock {
         other
             .as_any()
             .downcast_ref::<StatisticsSummaryReportBlock>()
-            .map_or(false, |a| self == a)
+            == Some(self)
     }
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
diff --git a/rtcp/src/extended_report/unknown.rs b/rtcp/src/extended_report/unknown.rs
@@ -41,10 +41,7 @@ impl Packet for UnknownReportBlock {
         self
     }
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<UnknownReportBlock>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<UnknownReportBlock>() == Some(self)
     }
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
diff --git a/rtcp/src/extended_report/vm.rs b/rtcp/src/extended_report/vm.rs
@@ -86,10 +86,7 @@ impl Packet for VoIPMetricsReportBlock {
         self
     }
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<VoIPMetricsReportBlock>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<VoIPMetricsReportBlock>() == Some(self)
     }
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
diff --git a/rtcp/src/goodbye/mod.rs b/rtcp/src/goodbye/mod.rs
@@ -63,10 +63,7 @@ impl Packet for Goodbye {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<Goodbye>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<Goodbye>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/payload_feedbacks/full_intra_request/mod.rs b/rtcp/src/payload_feedbacks/full_intra_request/mod.rs
@@ -71,10 +71,7 @@ impl Packet for FullIntraRequest {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<FullIntraRequest>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<FullIntraRequest>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/payload_feedbacks/picture_loss_indication/mod.rs b/rtcp/src/payload_feedbacks/picture_loss_indication/mod.rs
@@ -60,10 +60,7 @@ impl Packet for PictureLossIndication {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<PictureLossIndication>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<PictureLossIndication>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/payload_feedbacks/receiver_estimated_maximum_bitrate/mod.rs b/rtcp/src/payload_feedbacks/receiver_estimated_maximum_bitrate/mod.rs
@@ -90,7 +90,7 @@ impl Packet for ReceiverEstimatedMaximumBitrate {
         other
             .as_any()
             .downcast_ref::<ReceiverEstimatedMaximumBitrate>()
-            .map_or(false, |a| self == a)
+            == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/payload_feedbacks/slice_loss_indication/mod.rs b/rtcp/src/payload_feedbacks/slice_loss_indication/mod.rs
@@ -75,10 +75,7 @@ impl Packet for SliceLossIndication {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<SliceLossIndication>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<SliceLossIndication>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/raw_packet.rs b/rtcp/src/raw_packet.rs
@@ -40,10 +40,7 @@ impl Packet for RawPacket {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<RawPacket>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<RawPacket>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/receiver_report/mod.rs b/rtcp/src/receiver_report/mod.rs
@@ -80,10 +80,7 @@ impl Packet for ReceiverReport {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<ReceiverReport>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<ReceiverReport>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/reception_report.rs b/rtcp/src/reception_report.rs
@@ -73,10 +73,7 @@ impl Packet for ReceptionReport {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<ReceptionReport>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<ReceptionReport>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/sender_report/mod.rs b/rtcp/src/sender_report/mod.rs
@@ -117,10 +117,7 @@ impl Packet for SenderReport {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<SenderReport>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<SenderReport>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/source_description/mod.rs b/rtcp/src/source_description/mod.rs
@@ -321,10 +321,7 @@ impl Packet for SourceDescription {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<SourceDescription>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<SourceDescription>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/transport_feedbacks/rapid_resynchronization_request/mod.rs b/rtcp/src/transport_feedbacks/rapid_resynchronization_request/mod.rs
@@ -65,7 +65,7 @@ impl Packet for RapidResynchronizationRequest {
         other
             .as_any()
             .downcast_ref::<RapidResynchronizationRequest>()
-            .map_or(false, |a| self == a)
+            == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/transport_feedbacks/transport_layer_cc/mod.rs b/rtcp/src/transport_feedbacks/transport_layer_cc/mod.rs
@@ -507,10 +507,7 @@ impl Packet for TransportLayerCc {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<TransportLayerCc>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<TransportLayerCc>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/rtcp/src/transport_feedbacks/transport_layer_nack/mod.rs b/rtcp/src/transport_feedbacks/transport_layer_nack/mod.rs
@@ -154,10 +154,7 @@ impl Packet for TransportLayerNack {
     }
 
     fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<TransportLayerNack>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<TransportLayerNack>() == Some(self)
     }
 
     fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
diff --git a/srtp/src/session/mod.rs b/srtp/src/session/mod.rs
@@ -28,6 +28,7 @@ const DEFAULT_SESSION_SRTCP_REPLAY_PROTECTION_WINDOW: usize = 64;
 pub struct Session {
     local_context: Arc<Mutex<Context>>,
     streams_map: Arc<Mutex<HashMap<u32, Arc<Stream>>>>,
+    #[allow(clippy::type_complexity)]
     new_stream_rx: Arc<Mutex<mpsc::Receiver<(Arc<Stream>, Option<rtp::header::Header>)>>>,
     close_stream_tx: mpsc::Sender<u32>,
     close_session_tx: mpsc::Sender<()>,
diff --git a/turn/examples/turn_client_udp.rs b/turn/examples/turn_client_udp.rs
@@ -185,7 +185,7 @@ async fn do_ping_test(
     // Send 10 packets from relay_conn to the echo server
     for _ in 0..2 {
         let msg = "12345678910".to_owned(); //format!("{:?}", tokio::time::Instant::now());
-        println!("sending msg={} with size={}", msg, msg.as_bytes().len());
+        println!("sending msg={} with size={}", msg, msg.len());
         pinger_conn_tx.send_to(msg.as_bytes(), relay_addr).await?;
 
         // For simplicity, this example does not wait for the pong (reply).
diff --git a/webrtc/src/rtp_transceiver/fmtp/generic/mod.rs b/webrtc/src/rtp_transceiver/fmtp/generic/mod.rs
@@ -53,10 +53,7 @@ impl Fmtp for GenericFmtp {
     }
 
     fn equal(&self, other: &(dyn Fmtp)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<GenericFmtp>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<GenericFmtp>() == Some(self)
     }
 
     fn as_any(&self) -> &(dyn Any) {
diff --git a/webrtc/src/rtp_transceiver/fmtp/h264/mod.rs b/webrtc/src/rtp_transceiver/fmtp/h264/mod.rs
@@ -90,10 +90,7 @@ impl Fmtp for H264Fmtp {
     }
 
     fn equal(&self, other: &(dyn Fmtp)) -> bool {
-        other
-            .as_any()
-            .downcast_ref::<H264Fmtp>()
-            .map_or(false, |a| self == a)
+        other.as_any().downcast_ref::<H264Fmtp>() == Some(self)
     }
 
     fn as_any(&self) -> &(dyn Any) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ impl ExtensionServerName {`
`21`	`21`
`22`	`22`	`pub fn size(&self) -> usize {`
`23`	`23`	`//TODO: check how to do cryptobyte?`
`24`		`- 2 + 2 + 1 + 2 + self.server_name.as_bytes().len()`
	`24`	`+ 2 + 2 + 1 + 2 + self.server_name.len()`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`pub fn marshal<W: Write>(&self, writer: &mut W) -> Result<()> {`
Original file line number	Diff line number	Diff line change
`@@ -1599,8 +1599,8 @@ async fn test_agent_credentials() -> Result<()> {`
`1599`	`1599`	`let a = Agent::new(AgentConfig::default()).await?;`
`1600`	`1600`	`{`
`1601`	`1601`	`let ufrag_pwd = a.internal.ufrag_pwd.lock().await;`
`1602`		`- assert!(ufrag_pwd.local_ufrag.as_bytes().len() * 8 >= 24);`
`1603`		`- assert!(ufrag_pwd.local_pwd.as_bytes().len() * 8 >= 128);`
	`1602`	`+ assert!(ufrag_pwd.local_ufrag.len() * 8 >= 24);`
	`1603`	`+ assert!(ufrag_pwd.local_pwd.len() * 8 >= 128);`
`1604`	`1604`	`}`
`1605`	`1605`	`a.close().await?;`
`1606`	`1606`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl ResourceBody for TxtResource {`
`43`	`43`	`let (t, new_off) = unpack_str(msg, off)?;`
`44`	`44`	`off = new_off;`
`45`	`45`	`// Check if we got too many bytes.`
`46`		`- if length < n + t.as_bytes().len() + 1 {`
	`46`	`+ if length < n + t.len() + 1 {`
`47`	`47`	`return Err(Error::ErrCalcLen);`
`48`	`48`	`}`
`49`	`49`	`n += t.len() + 1;`
Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,7 @@ impl Packet for CompoundPacket {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {`
`69`		`- other`
`70`		`- .as_any()`
`71`		`- .downcast_ref::<CompoundPacket>()`
`72`		`- .map_or(false, \|a\| self == a)`
	`69`	`+ other.as_any().downcast_ref::<CompoundPacket>() == Some(self)`
`73`	`70`	`}`
`74`	`71`
`75`	`72`	`fn cloned(&self) -> Box<dyn Packet + Send + Sync> {`
Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,7 @@ impl Packet for DLRRReportBlock {`
`77`	`77`	`self`
`78`	`78`	`}`
`79`	`79`	`fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {`
`80`		`- other`
`81`		`- .as_any()`
`82`		`- .downcast_ref::<DLRRReportBlock>()`
`83`		`- .map_or(false, \|a\| self == a)`
	`80`	`+ other.as_any().downcast_ref::<DLRRReportBlock>() == Some(self)`
`84`	`81`	`}`
`85`	`82`	`fn cloned(&self) -> Box<dyn Packet + Send + Sync> {`
`86`	`83`	`Box::new(self.clone())`
Original file line number	Diff line number	Diff line change
`@@ -199,10 +199,7 @@ impl Packet for ExtendedReport {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {`
`202`		`- other`
`203`		`- .as_any()`
`204`		`- .downcast_ref::<ExtendedReport>()`
`205`		`- .map_or(false, \|a\| self == a)`
	`202`	`+ other.as_any().downcast_ref::<ExtendedReport>() == Some(self)`
`206`	`203`	`}`
`207`	`204`
`208`	`205`	`fn cloned(&self) -> Box<dyn Packet + Send + Sync> {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ impl Packet for PacketReceiptTimesReportBlock {`
`71`	`71`	`other`
`72`	`72`	`.as_any()`
`73`	`73`	`.downcast_ref::<PacketReceiptTimesReportBlock>()`
`74`		`- .map_or(false, \|a\| self == a)`
	`74`	`+ == Some(self)`
`75`	`75`	`}`
`76`	`76`	`fn cloned(&self) -> Box<dyn Packet + Send + Sync> {`
`77`	`77`	`Box::new(self.clone())`
Original file line number	Diff line number	Diff line change
`@@ -163,10 +163,7 @@ impl Packet for RLEReportBlock {`
`163`	`163`	`self`
`164`	`164`	`}`
`165`	`165`	`fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {`
`166`		`- other`
`167`		`- .as_any()`
`168`		`- .downcast_ref::<RLEReportBlock>()`
`169`		`- .map_or(false, \|a\| self == a)`
	`166`	`+ other.as_any().downcast_ref::<RLEReportBlock>() == Some(self)`
`170`	`167`	`}`
`171`	`168`	`fn cloned(&self) -> Box<dyn Packet + Send + Sync> {`
`172`	`169`	`Box::new(self.clone())`