From 630c46fe32e9ece44ba50254445a2fdaacef0428 Mon Sep 17 00:00:00 2001 From: Hugo Tunius Date: Mon, 19 Dec 2022 11:02:37 +0100 Subject: [PATCH] Fix clippy for rust 1.66 (#369) --- dtls/examples/hub/src/utilities.rs | 4 ++-- dtls/src/cipher_suite/mod.rs | 4 ++-- .../extension_supported_point_formats.rs | 2 +- dtls/src/fragment_buffer/mod.rs | 4 ++-- .../data-channels-close.rs | 2 +- .../data-channels-create.rs | 2 +- .../data-channels-detach-create.rs | 2 +- .../data-channels-detach.rs | 2 +- .../data-channels-flow-control.rs | 4 ++-- .../examples/data-channels/data-channels.rs | 2 +- .../insertable-streams/insertable-streams.rs | 4 ++-- examples/examples/offer-answer/answer.rs | 2 +- examples/examples/offer-answer/offer.rs | 2 +- .../play-from-disk-h264.rs | 6 +++--- .../play-from-disk-renegotiation.rs | 2 +- .../play-from-disk-vpx/play-from-disk-vpx.rs | 6 +++--- examples/examples/reflect/reflect.rs | 2 +- .../examples/rtp-forwarder/rtp-forwarder.rs | 2 +- .../examples/rtp-to-webrtc/rtp-to-webrtc.rs | 2 +- .../save-to-disk-h264/save-to-disk-h264.rs | 2 +- .../save-to-disk-vpx/save-to-disk-vpx.rs | 2 +- examples/examples/swap-tracks/swap-tracks.rs | 2 +- ice/examples/ping_pong.rs | 2 +- ice/src/agent/agent_selector.rs | 2 +- ice/src/control/mod.rs | 2 +- .../src/report/receiver/receiver_stream.rs | 2 +- interceptor/src/stats/interceptor.rs | 2 +- mdns/src/message/header.rs | 2 +- mdns/src/message/resource/mod.rs | 20 +++++++++---------- media/src/io/ivf_writer/mod.rs | 4 ++-- media/src/io/ogg_reader/mod.rs | 2 +- rtcp/src/goodbye/mod.rs | 2 +- .../transport_layer_cc/mod.rs | 2 +- rtp/src/codecs/h264/mod.rs | 4 ++-- sctp/src/association/association_internal.rs | 6 +++++- sctp/src/timer/rtx_timer.rs | 5 +---- srtp/src/option.rs | 4 ++-- stun/benches/bench.rs | 2 +- stun/examples/stun_client.rs | 5 +---- stun/src/client.rs | 2 +- .../allocation_manager_test.rs | 14 ++++++------- turn/src/auth/mod.rs | 2 +- turn/src/server/request/request_test.rs | 2 +- .../peer_connection_internal.rs | 2 +- webrtc/src/rtp_transceiver/rtp_codec.rs | 8 ++++---- 45 files changed, 79 insertions(+), 81 deletions(-) diff --git a/dtls/examples/hub/src/utilities.rs b/dtls/examples/hub/src/utilities.rs index 7df36ddb4..118e1e8d6 100644 --- a/dtls/examples/hub/src/utilities.rs +++ b/dtls/examples/hub/src/utilities.rs @@ -88,7 +88,7 @@ pub fn load_key_and_certificate( /// load_key Load/read key from file pub fn load_key(path: PathBuf) -> Result { - let f = File::open(&path)?; + let f = File::open(path)?; let mut reader = BufReader::new(f); let mut buf = vec![]; reader.read_to_end(&mut buf)?; @@ -102,7 +102,7 @@ pub fn load_key(path: PathBuf) -> Result { /// load_certificate Load/read certificate(s) from file pub fn load_certificate(path: PathBuf) -> Result, Error> { - let f = File::open(&path)?; + let f = File::open(path)?; let mut reader = BufReader::new(f); match certs(&mut reader) { diff --git a/dtls/src/cipher_suite/mod.rs b/dtls/src/cipher_suite/mod.rs index 7a0eb2353..463688c1f 100644 --- a/dtls/src/cipher_suite/mod.rs +++ b/dtls/src/cipher_suite/mod.rs @@ -165,7 +165,7 @@ pub fn cipher_suite_for_id(id: CipherSuiteId) -> Result { - Ok(Box::new(CipherSuiteTlsPskWithAes128GcmSha256::default())) + Ok(Box::::default()) } _ => Err(Error::ErrInvalidCipherSuite), } @@ -191,7 +191,7 @@ fn all_cipher_suites() -> Vec> { Box::new(CipherSuiteAes256CbcSha::new(true)), Box::new(new_cipher_suite_tls_psk_with_aes_128_ccm()), Box::new(new_cipher_suite_tls_psk_with_aes_128_ccm8()), - Box::new(CipherSuiteTlsPskWithAes128GcmSha256::default()), + Box::::default(), ] } diff --git a/dtls/src/extension/extension_supported_point_formats.rs b/dtls/src/extension/extension_supported_point_formats.rs index 24c8a56fe..17e2448af 100644 --- a/dtls/src/extension/extension_supported_point_formats.rs +++ b/dtls/src/extension/extension_supported_point_formats.rs @@ -28,7 +28,7 @@ impl ExtensionSupportedPointFormats { writer.write_u16::(1 + self.point_formats.len() as u16)?; writer.write_u8(self.point_formats.len() as u8)?; for v in &self.point_formats { - writer.write_u8(*v as u8)?; + writer.write_u8(*v)?; } Ok(writer.flush()?) diff --git a/dtls/src/fragment_buffer/mod.rs b/dtls/src/fragment_buffer/mod.rs index 0b245a284..5c16dc6f1 100644 --- a/dtls/src/fragment_buffer/mod.rs +++ b/dtls/src/fragment_buffer/mod.rs @@ -127,8 +127,8 @@ impl FragmentBuffer { fn size(&self) -> usize { self.cache - .iter() - .map(|(_, fragment)| fragment.iter().map(|f| f.data.len()).sum::()) + .values() + .map(|fragment| fragment.iter().map(|f| f.data.len()).sum::()) .sum() } } diff --git a/examples/examples/data-channels-close/data-channels-close.rs b/examples/examples/data-channels-close/data-channels-close.rs index 39e5de3b6..3b66bbee2 100644 --- a/examples/examples/data-channels-close/data-channels-close.rs +++ b/examples/examples/data-channels-close/data-channels-close.rs @@ -229,7 +229,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/data-channels-create/data-channels-create.rs b/examples/examples/data-channels-create/data-channels-create.rs index 346ba027c..f3b599bc4 100644 --- a/examples/examples/data-channels-create/data-channels-create.rs +++ b/examples/examples/data-channels-create/data-channels-create.rs @@ -183,7 +183,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/data-channels-detach-create/data-channels-detach-create.rs b/examples/examples/data-channels-detach-create/data-channels-detach-create.rs index a35852b3e..6d19e5788 100644 --- a/examples/examples/data-channels-detach-create/data-channels-detach-create.rs +++ b/examples/examples/data-channels-detach-create/data-channels-detach-create.rs @@ -192,7 +192,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/data-channels-detach/data-channels-detach.rs b/examples/examples/data-channels-detach/data-channels-detach.rs index 5a1b9ad2c..4162b1c84 100644 --- a/examples/examples/data-channels-detach/data-channels-detach.rs +++ b/examples/examples/data-channels-detach/data-channels-detach.rs @@ -200,7 +200,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/data-channels-flow-control/data-channels-flow-control.rs b/examples/examples/data-channels-flow-control/data-channels-flow-control.rs index 3d220297b..0b53f74a1 100644 --- a/examples/examples/data-channels-flow-control/data-channels-flow-control.rs +++ b/examples/examples/data-channels-flow-control/data-channels-flow-control.rs @@ -127,7 +127,7 @@ async fn create_responder() -> anyhow::Result { let start = SystemTime::now(); tokio::time::sleep(Duration::from_secs(1)).await; - println!(""); + println!(); loop { let total_bytes_received = @@ -246,7 +246,7 @@ async fn main() -> anyhow::Result<()> { requester.close().await?; responder.close().await?; - println!(""); + println!(); Ok(()) } diff --git a/examples/examples/data-channels/data-channels.rs b/examples/examples/data-channels/data-channels.rs index 9ce47abf7..6d3dbfc0a 100644 --- a/examples/examples/data-channels/data-channels.rs +++ b/examples/examples/data-channels/data-channels.rs @@ -191,7 +191,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/insertable-streams/insertable-streams.rs b/examples/examples/insertable-streams/insertable-streams.rs index 349d8ec6f..6fd079be1 100644 --- a/examples/examples/insertable-streams/insertable-streams.rs +++ b/examples/examples/insertable-streams/insertable-streams.rs @@ -155,7 +155,7 @@ async fn main() -> Result<()> { let (mut ivf, header) = IVFReader::new(reader)?; // Wait for connection established - let _ = notify_video.notified().await; + notify_video.notified().await; println!("play video from disk file output.ivf"); @@ -259,7 +259,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/offer-answer/answer.rs b/examples/examples/offer-answer/answer.rs index f4f5e4c23..ef1b24a99 100644 --- a/examples/examples/offer-answer/answer.rs +++ b/examples/examples/offer-answer/answer.rs @@ -381,7 +381,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/offer-answer/offer.rs b/examples/examples/offer-answer/offer.rs index 5783f2ab4..ba54e2fd8 100644 --- a/examples/examples/offer-answer/offer.rs +++ b/examples/examples/offer-answer/offer.rs @@ -367,7 +367,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/play-from-disk-h264/play-from-disk-h264.rs b/examples/examples/play-from-disk-h264/play-from-disk-h264.rs index 3e9521d39..e6dedc7a8 100644 --- a/examples/examples/play-from-disk-h264/play-from-disk-h264.rs +++ b/examples/examples/play-from-disk-h264/play-from-disk-h264.rs @@ -175,7 +175,7 @@ async fn main() -> Result<()> { let mut h264 = H264Reader::new(reader); // Wait for connection established - let _ = notify_video.notified().await; + notify_video.notified().await; println!("play video from disk file {}", video_file_name); @@ -252,7 +252,7 @@ async fn main() -> Result<()> { let (mut ogg, _) = OggReader::new(reader, true)?; // Wait for connection established - let _ = notify_audio.notified().await; + notify_audio.notified().await; println!("play audio from disk file output.ogg"); @@ -351,7 +351,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/play-from-disk-renegotiation/play-from-disk-renegotiation.rs b/examples/examples/play-from-disk-renegotiation/play-from-disk-renegotiation.rs index 5ed63a309..370efab92 100644 --- a/examples/examples/play-from-disk-renegotiation/play-from-disk-renegotiation.rs +++ b/examples/examples/play-from-disk-renegotiation/play-from-disk-renegotiation.rs @@ -361,7 +361,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/play-from-disk-vpx/play-from-disk-vpx.rs b/examples/examples/play-from-disk-vpx/play-from-disk-vpx.rs index f015ac13b..27720350b 100644 --- a/examples/examples/play-from-disk-vpx/play-from-disk-vpx.rs +++ b/examples/examples/play-from-disk-vpx/play-from-disk-vpx.rs @@ -185,7 +185,7 @@ async fn main() -> Result<()> { let (mut ivf, header) = IVFReader::new(reader)?; // Wait for connection established - let _ = notify_video.notified().await; + notify_video.notified().await; println!("play video from disk file {}", video_file_name); @@ -263,7 +263,7 @@ async fn main() -> Result<()> { } }; // Wait for connection established - let _ = notify_audio.notified().await; + notify_audio.notified().await; println!("play audio from disk file output.ogg"); @@ -362,7 +362,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/reflect/reflect.rs b/examples/examples/reflect/reflect.rs index d465c9128..64de0a79d 100644 --- a/examples/examples/reflect/reflect.rs +++ b/examples/examples/reflect/reflect.rs @@ -315,7 +315,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/rtp-forwarder/rtp-forwarder.rs b/examples/examples/rtp-forwarder/rtp-forwarder.rs index c40b6d119..278a027b4 100644 --- a/examples/examples/rtp-forwarder/rtp-forwarder.rs +++ b/examples/examples/rtp-forwarder/rtp-forwarder.rs @@ -312,7 +312,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/rtp-to-webrtc/rtp-to-webrtc.rs b/examples/examples/rtp-to-webrtc/rtp-to-webrtc.rs index 2e8d731c8..7fe8718bc 100644 --- a/examples/examples/rtp-to-webrtc/rtp-to-webrtc.rs +++ b/examples/examples/rtp-to-webrtc/rtp-to-webrtc.rs @@ -209,7 +209,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/save-to-disk-h264/save-to-disk-h264.rs b/examples/examples/save-to-disk-h264/save-to-disk-h264.rs index bb94be9da..fa33c0c10 100644 --- a/examples/examples/save-to-disk-h264/save-to-disk-h264.rs +++ b/examples/examples/save-to-disk-h264/save-to-disk-h264.rs @@ -307,7 +307,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/save-to-disk-vpx/save-to-disk-vpx.rs b/examples/examples/save-to-disk-vpx/save-to-disk-vpx.rs index ed1b78eff..b07ee9385 100644 --- a/examples/examples/save-to-disk-vpx/save-to-disk-vpx.rs +++ b/examples/examples/save-to-disk-vpx/save-to-disk-vpx.rs @@ -337,7 +337,7 @@ async fn main() -> Result<()> { println!("received done signal!"); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); } }; diff --git a/examples/examples/swap-tracks/swap-tracks.rs b/examples/examples/swap-tracks/swap-tracks.rs index c5fcad278..91a0ad8e4 100644 --- a/examples/examples/swap-tracks/swap-tracks.rs +++ b/examples/examples/swap-tracks/swap-tracks.rs @@ -299,7 +299,7 @@ async fn main() -> Result<()> { break; } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); break; } }; diff --git a/ice/examples/ping_pong.rs b/ice/examples/ping_pong.rs index 2e4c0ca87..782fdc053 100644 --- a/ice/examples/ping_pong.rs +++ b/ice/examples/ping_pong.rs @@ -395,7 +395,7 @@ async fn main() -> Result<(), Error> { let _ = done_tx.send(()); } _ = tokio::signal::ctrl_c() => { - println!(""); + println!(); let _ = done_tx.send(()); } }; diff --git a/ice/src/agent/agent_selector.rs b/ice/src/agent/agent_selector.rs index b1abedecb..c8e80e579 100644 --- a/ice/src/agent/agent_selector.rs +++ b/ice/src/agent/agent_selector.rs @@ -120,7 +120,7 @@ impl AgentInternal { Box::new(BINDING_REQUEST), Box::new(TransactionId::new()), Box::new(Username::new(ATTR_USERNAME, username)), - Box::new(UseCandidateAttr::default()), + Box::::default(), Box::new(AttrControlling(self.tie_breaker.load(Ordering::SeqCst))), Box::new(PriorityAttr(pair.local.priority())), Box::new(MessageIntegrity::new_short_term_integrity( diff --git a/ice/src/control/mod.rs b/ice/src/control/mod.rs index f10f06ffc..8bc6efe82 100644 --- a/ice/src/control/mod.rs +++ b/ice/src/control/mod.rs @@ -17,7 +17,7 @@ impl TieBreaker { /// Adds Tiebreaker value to m as t attribute. pub fn add_to_as(self, m: &mut Message, t: AttrType) -> Result<(), stun::Error> { let mut v = vec![0; TIE_BREAKER_SIZE]; - v.copy_from_slice(&(self.0 as u64).to_be_bytes()); + v.copy_from_slice(&self.0.to_be_bytes()); m.add(t, &v); Ok(()) } diff --git a/interceptor/src/report/receiver/receiver_stream.rs b/interceptor/src/report/receiver/receiver_stream.rs index 17cae81c5..d1bf63a81 100644 --- a/interceptor/src/report/receiver/receiver_stream.rs +++ b/interceptor/src/report/receiver/receiver_stream.rs @@ -51,7 +51,7 @@ impl ReceiverStreamInternal { // following frames self.set_received(pkt.header.sequence_number); - let diff = pkt.header.sequence_number as i32 - self.last_seq_num as i32; + let diff = pkt.header.sequence_number as i32 - self.last_seq_num; if !(-0x0FFF..=0).contains(&diff) { // overflow if diff < -0x0FFF { diff --git a/interceptor/src/stats/interceptor.rs b/interceptor/src/stats/interceptor.rs index e05c3164e..b20206633 100644 --- a/interceptor/src/stats/interceptor.rs +++ b/interceptor/src/stats/interceptor.rs @@ -816,7 +816,7 @@ fn calculate_rtt_ms(now: u32, delay: u32, last_report: u32) -> Option { let rtt_seconds = rtt >> 16; let rtt_fraction = (rtt & (u16::MAX as u32)) as f64 / (u16::MAX as u32) as f64; - Some(rtt_seconds as f64 * 1000.0 + (rtt_fraction as f64) * 1000.0) + Some(rtt_seconds as f64 * 1000.0 + rtt_fraction * 1000.0) } #[cfg(test)] diff --git a/mdns/src/message/header.rs b/mdns/src/message/header.rs index 5d86d351d..b57118c14 100644 --- a/mdns/src/message/header.rs +++ b/mdns/src/message/header.rs @@ -33,7 +33,7 @@ impl fmt::Display for Header { impl Header { pub fn pack(&self) -> (u16, u16) { let id = self.id; - let mut bits = (self.op_code as u16) << 11 | self.rcode as u16; + let mut bits = self.op_code << 11 | self.rcode as u16; if self.recursion_available { bits |= HEADER_BIT_RA } diff --git a/mdns/src/message/resource/mod.rs b/mdns/src/message/resource/mod.rs index 48bc132f5..625b74e63 100644 --- a/mdns/src/message/resource/mod.rs +++ b/mdns/src/message/resource/mod.rs @@ -254,16 +254,16 @@ pub fn unpack_resource_body( length: usize, ) -> Result<(Box, usize)> { let mut rb: Box = match typ { - DnsType::A => Box::new(AResource::default()), - DnsType::Ns => Box::new(NsResource::default()), - DnsType::Cname => Box::new(CnameResource::default()), - DnsType::Soa => Box::new(SoaResource::default()), - DnsType::Ptr => Box::new(PtrResource::default()), - DnsType::Mx => Box::new(MxResource::default()), - DnsType::Txt => Box::new(TxtResource::default()), - DnsType::Aaaa => Box::new(AaaaResource::default()), - DnsType::Srv => Box::new(SrvResource::default()), - DnsType::Opt => Box::new(OptResource::default()), + DnsType::A => Box::::default(), + DnsType::Ns => Box::::default(), + DnsType::Cname => Box::::default(), + DnsType::Soa => Box::::default(), + DnsType::Ptr => Box::::default(), + DnsType::Mx => Box::::default(), + DnsType::Txt => Box::::default(), + DnsType::Aaaa => Box::::default(), + DnsType::Srv => Box::::default(), + DnsType::Opt => Box::::default(), _ => return Err(Error::ErrNilResourceBody), }; diff --git a/media/src/io/ivf_writer/mod.rs b/media/src/io/ivf_writer/mod.rs index da312a708..d3ccbae8a 100644 --- a/media/src/io/ivf_writer/mod.rs +++ b/media/src/io/ivf_writer/mod.rs @@ -57,9 +57,9 @@ impl Writer for IVFWriter { /// write_rtp adds a new packet and writes the appropriate headers for it fn write_rtp(&mut self, packet: &rtp::packet::Packet) -> Result<()> { let mut depacketizer: Box = if self.is_vp9 { - Box::new(rtp::codecs::vp9::Vp9Packet::default()) + Box::::default() } else { - Box::new(rtp::codecs::vp8::Vp8Packet::default()) + Box::::default() }; let payload = depacketizer.depacketize(&packet.payload)?; diff --git a/media/src/io/ogg_reader/mod.rs b/media/src/io/ogg_reader/mod.rs index f1968a67d..408393b56 100644 --- a/media/src/io/ogg_reader/mod.rs +++ b/media/src/io/ogg_reader/mod.rs @@ -132,7 +132,7 @@ impl OggReader { } let mut payload = BytesMut::with_capacity(payload_size); - payload.resize(payload_size as usize, 0); + payload.resize(payload_size, 0); self.reader.read_exact(&mut payload)?; if self.do_checksum { diff --git a/rtcp/src/goodbye/mod.rs b/rtcp/src/goodbye/mod.rs index 0a2128bc6..c0268b4bd 100644 --- a/rtcp/src/goodbye/mod.rs +++ b/rtcp/src/goodbye/mod.rs @@ -158,7 +158,7 @@ impl Unmarshal for Goodbye { return Err(Error::PacketTooShort.into()); } - let reason_offset = (HEADER_LENGTH + header.count as usize * SSRC_LENGTH) as usize; + let reason_offset = HEADER_LENGTH + header.count as usize * SSRC_LENGTH; if reason_offset > raw_packet_len { return Err(Error::PacketTooShort.into()); diff --git a/rtcp/src/transport_feedbacks/transport_layer_cc/mod.rs b/rtcp/src/transport_feedbacks/transport_layer_cc/mod.rs index 9d7bc4ac0..486c27e08 100644 --- a/rtcp/src/transport_feedbacks/transport_layer_cc/mod.rs +++ b/rtcp/src/transport_feedbacks/transport_layer_cc/mod.rs @@ -204,7 +204,7 @@ impl Unmarshal for RunLengthChunk { let b1 = raw_packet.get_u8(); // get PacketStatusSymbol - let packet_status_symbol = (get_nbits_from_byte(b0, 1, 2) as u16).into(); + let packet_status_symbol = get_nbits_from_byte(b0, 1, 2).into(); // get RunLength let run_length = ((get_nbits_from_byte(b0, 3, 5) as usize) << 8) as u16 + (b1 as u16); diff --git a/rtp/src/codecs/h264/mod.rs b/rtp/src/codecs/h264/mod.rs index 7c4cca064..d64a9ecfc 100644 --- a/rtp/src/codecs/h264/mod.rs +++ b/rtp/src/codecs/h264/mod.rs @@ -255,7 +255,7 @@ impl Depacketizer for H264Packet { Ok(payload.freeze()) } FUA_NALU_TYPE => { - if packet.len() < FUA_HEADER_SIZE as usize { + if packet.len() < FUA_HEADER_SIZE { return Err(Error::ErrShortPacket); } @@ -264,7 +264,7 @@ impl Depacketizer for H264Packet { } if let Some(fua_buffer) = &mut self.fua_buffer { - fua_buffer.put(&*packet.slice(FUA_HEADER_SIZE as usize..)); + fua_buffer.put(&*packet.slice(FUA_HEADER_SIZE..)); } let b1 = packet[1]; diff --git a/sctp/src/association/association_internal.rs b/sctp/src/association/association_internal.rs index 21878f5c7..a3e5686bc 100644 --- a/sctp/src/association/association_internal.rs +++ b/sctp/src/association/association_internal.rs @@ -155,7 +155,11 @@ impl AssociationInternal { // o The initial cwnd before DATA transmission or after a sufficiently // long idle period MUST be set to min(4*MTU, max (2*MTU, 4380 // bytes)). - a.cwnd = std::cmp::min(4 * a.mtu, std::cmp::max(2 * a.mtu, 4380)); + // TODO: Consider whether this should use `clamp` + #[allow(clippy::manual_clamp)] + { + a.cwnd = std::cmp::min(4 * a.mtu, std::cmp::max(2 * a.mtu, 4380)); + } log::trace!( "[{}] updated cwnd={} ssthresh={} inflight={} (INI)", a.name, diff --git a/sctp/src/timer/rtx_timer.rs b/sctp/src/timer/rtx_timer.rs index 2e8bae89f..37b627eb6 100644 --- a/sctp/src/timer/rtx_timer.rs +++ b/sctp/src/timer/rtx_timer.rs @@ -51,10 +51,7 @@ impl RtoManager { self.srtt = ((RTO_BASE - RTO_ALPHA) * self.srtt + RTO_ALPHA * rtt) / RTO_BASE; } - self.rto = std::cmp::min( - std::cmp::max(self.srtt + (4.0 * self.rttvar) as u64, RTO_MIN), - RTO_MAX, - ); + self.rto = (self.srtt + (4.0 * self.rttvar) as u64).clamp(RTO_MIN, RTO_MAX); self.srtt } diff --git a/srtp/src/option.rs b/srtp/src/option.rs index 54b3528a1..d2513a866 100644 --- a/srtp/src/option.rs +++ b/srtp/src/option.rs @@ -27,10 +27,10 @@ pub fn srtcp_replay_protection(window_size: usize) -> ContextOption { /// srtp_no_replay_protection disables SRTP replay protection. pub fn srtp_no_replay_protection() -> ContextOption { - Box::new(|| -> Box { Box::new(NoOpReplayDetector::default()) }) + Box::new(|| -> Box { Box::::default() }) } /// srtcp_no_replay_protection disables SRTCP replay protection. pub fn srtcp_no_replay_protection() -> ContextOption { - Box::new(|| -> Box { Box::new(NoOpReplayDetector::default()) }) + Box::new(|| -> Box { Box::::default() }) } diff --git a/stun/benches/bench.rs b/stun/benches/bench.rs index 2a6904935..7ff4c463b 100644 --- a/stun/benches/bench.rs +++ b/stun/benches/bench.rs @@ -79,7 +79,7 @@ fn benchmark_agent(c: &mut Criterion) { } let mut m = Message::new(); - m.build(&[Box::new(TransactionId::default())]).unwrap(); + m.build(&[Box::::default()]).unwrap(); c.bench_function("BenchmarkAgent_Process", |b| { b.iter(|| { a.process(m.clone()).unwrap(); diff --git a/stun/examples/stun_client.rs b/stun/examples/stun_client.rs index 4bc61056a..4729b6115 100644 --- a/stun/examples/stun_client.rs +++ b/stun/examples/stun_client.rs @@ -48,10 +48,7 @@ async fn main() -> Result<(), Error> { let mut client = ClientBuilder::new().with_conn(Arc::new(conn)).build()?; let mut msg = Message::new(); - msg.build(&[ - Box::new(TransactionId::default()), - Box::new(BINDING_REQUEST), - ])?; + msg.build(&[Box::::default(), Box::new(BINDING_REQUEST)])?; client.send(&msg, Some(Arc::new(handler_tx))).await?; diff --git a/stun/src/client.rs b/stun/src/client.rs index e91287ea8..6f9f0b4e3 100644 --- a/stun/src/client.rs +++ b/stun/src/client.rs @@ -412,7 +412,7 @@ impl Client { tokio::spawn(async move { Agent::run(agent, client_agent_rx).await }); if self.settings.collector.is_none() { - self.settings.collector = Some(Box::new(TickerCollector::default())); + self.settings.collector = Some(Box::::default()); } if let Some(collector) = &mut self.settings.collector { collector.start(self.settings.rto_rate, Arc::clone(&client_agent_tx))?; diff --git a/turn/src/allocation/allocation_manager/allocation_manager_test.rs b/turn/src/allocation/allocation_manager/allocation_manager_test.rs index b8845b34e..3e9355468 100644 --- a/turn/src/allocation/allocation_manager/allocation_manager_test.rs +++ b/turn/src/allocation/allocation_manager/allocation_manager_test.rs @@ -175,7 +175,7 @@ async fn test_create_allocation_duplicate_five_tuple() -> Result<()> { let _ = m .create_allocation( - five_tuple.clone(), + five_tuple, Arc::clone(&turn_socket), 0, DEFAULT_LIFETIME, @@ -210,7 +210,7 @@ async fn test_delete_allocation() -> Result<()> { let _ = m .create_allocation( - five_tuple.clone(), + five_tuple, Arc::clone(&turn_socket), 0, DEFAULT_LIFETIME, @@ -348,7 +348,7 @@ async fn test_delete_allocation_by_username() -> Result<()> { let _ = m .create_allocation( - five_tuple1.clone(), + five_tuple1, Arc::clone(&turn_socket), 0, DEFAULT_LIFETIME, @@ -357,7 +357,7 @@ async fn test_delete_allocation_by_username() -> Result<()> { .await?; let _ = m .create_allocation( - five_tuple2.clone(), + five_tuple2, Arc::clone(&turn_socket), 0, DEFAULT_LIFETIME, @@ -366,7 +366,7 @@ async fn test_delete_allocation_by_username() -> Result<()> { .await?; let _ = m .create_allocation( - five_tuple3.clone(), + five_tuple3, Arc::clone(&turn_socket), 0, DEFAULT_LIFETIME, @@ -421,7 +421,7 @@ async fn create_server() -> Result<(Server, u16)> { async fn create_client(username: String, server_port: u16) -> Result { let conn = Arc::new(UdpSocket::bind("0.0.0.0:0").await?); - Ok(Client::new(ClientConfig { + Client::new(ClientConfig { stun_serv_addr: format!("127.0.0.1:{}", server_port), turn_serv_addr: format!("127.0.0.1:{}", server_port), username, @@ -432,7 +432,7 @@ async fn create_client(username: String, server_port: u16) -> Result { conn, vnet: None, }) - .await?) + .await } #[cfg(feature = "metrics")] diff --git a/turn/src/auth/mod.rs b/turn/src/auth/mod.rs index c60dda9fa..61f6690e7 100644 --- a/turn/src/auth/mod.rs +++ b/turn/src/auth/mod.rs @@ -30,7 +30,7 @@ fn long_term_credentials(username: &str, shared_secret: &str) -> String { shared_secret.as_bytes(), ); let password = hmac::sign(&mac, username.as_bytes()).as_ref().to_vec(); - base64::encode(&password) + base64::encode(password) } // generate_auth_key is a convenience function to easily generate keys in the format used by AuthHandler diff --git a/turn/src/server/request/request_test.rs b/turn/src/server/request/request_test.rs index a8136a83e..2bc1f265c 100644 --- a/turn/src/server/request/request_test.rs +++ b/turn/src/server/request/request_test.rs @@ -88,7 +88,7 @@ async fn test_allocation_lifetime_deletion_zero_lifetime() -> Result<()> { r.allocation_manager .create_allocation( - five_tuple.clone(), + five_tuple, Arc::clone(&r.conn), 0, Duration::from_secs(3600), diff --git a/webrtc/src/peer_connection/peer_connection_internal.rs b/webrtc/src/peer_connection/peer_connection_internal.rs index 03326491b..78621d7a7 100644 --- a/webrtc/src/peer_connection/peer_connection_internal.rs +++ b/webrtc/src/peer_connection/peer_connection_internal.rs @@ -1469,7 +1469,7 @@ impl PeerConnectionInternal { ssrc, kind, - packets_received: remote_inbound_packets_received as u64, + packets_received: remote_inbound_packets_received, packets_lost: remote_inbound_packets_lost as i64, local_id, diff --git a/webrtc/src/rtp_transceiver/rtp_codec.rs b/webrtc/src/rtp_transceiver/rtp_codec.rs index c52aadbd7..9a7c3cab7 100644 --- a/webrtc/src/rtp_transceiver/rtp_codec.rs +++ b/webrtc/src/rtp_transceiver/rtp_codec.rs @@ -70,21 +70,21 @@ impl RTCRtpCodecCapability { pub fn payloader_for_codec(&self) -> Result> { let mime_type = self.mime_type.to_lowercase(); if mime_type == MIME_TYPE_H264.to_lowercase() { - Ok(Box::new(rtp::codecs::h264::H264Payloader::default())) + Ok(Box::::default()) } else if mime_type == MIME_TYPE_VP8.to_lowercase() { let mut vp8_payloader = rtp::codecs::vp8::Vp8Payloader::default(); vp8_payloader.enable_picture_id = true; Ok(Box::new(vp8_payloader)) } else if mime_type == MIME_TYPE_VP9.to_lowercase() { - Ok(Box::new(rtp::codecs::vp9::Vp9Payloader::default())) + Ok(Box::::default()) } else if mime_type == MIME_TYPE_OPUS.to_lowercase() { - Ok(Box::new(rtp::codecs::opus::OpusPayloader::default())) + Ok(Box::::default()) } else if mime_type == MIME_TYPE_G722.to_lowercase() || mime_type == MIME_TYPE_PCMU.to_lowercase() || mime_type == MIME_TYPE_PCMA.to_lowercase() || mime_type == MIME_TYPE_TELEPHONE_EVENT.to_lowercase() { - Ok(Box::new(rtp::codecs::g7xx::G7xxPayloader::default())) + Ok(Box::::default()) } else { Err(Error::ErrNoPayloaderForCodec) }