From be3ae583bcdfc3eea2d7aab0c53949db0198ab24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 2 May 2024 18:22:50 +0300 Subject: [PATCH] Fix new Rust 1.78 clippy warnings Part-of: --- generic/threadshare/src/inputselector/imp.rs | 4 ++-- mux/flavors/src/bytes.rs | 2 ++ net/aws/src/s3url.rs | 7 ++++--- net/aws/src/transcriber/imp.rs | 13 +++++++------ net/hlssink3/src/playlist.rs | 2 +- net/rtp/src/basedepay/mod.rs | 1 + net/rtp/src/basepay/mod.rs | 1 + net/webrtc/signalling/src/server/mod.rs | 16 ++++++---------- net/webrtc/src/janusvr_signaller/imp.rs | 2 +- net/webrtc/src/webrtcsink/imp.rs | 2 +- net/webrtc/src/whip_signaller/imp.rs | 5 ----- video/closedcaption/src/cea708utils.rs | 2 +- 12 files changed, 27 insertions(+), 30 deletions(-) diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs index 81cf5cd3..006feb74 100644 --- a/generic/threadshare/src/inputselector/imp.rs +++ b/generic/threadshare/src/inputselector/imp.rs @@ -417,8 +417,8 @@ impl ObjectImpl for InputSelector { let pads = self.pads.lock().unwrap(); let mut old_pad = None; if let Some(ref pad) = pad { - if pads.sink_pads.get(pad).is_some() { - old_pad = state.active_sinkpad.clone(); + if pads.sink_pads.contains_key(pad) { + old_pad.clone_from(&state.active_sinkpad); state.active_sinkpad = Some(pad.clone()); state.switched_pad = true; } diff --git a/mux/flavors/src/bytes.rs b/mux/flavors/src/bytes.rs index 02263993..0c0bfe8c 100644 --- a/mux/flavors/src/bytes.rs +++ b/mux/flavors/src/bytes.rs @@ -11,6 +11,7 @@ pub use byteorder::{BigEndian, LittleEndian, ReadBytesExt, WriteBytesExt}; use std::io; +#[allow(unused)] pub trait ReadBytesExtShort: io::Read { fn read_u16le(&mut self) -> io::Result { self.read_u16::() @@ -76,6 +77,7 @@ pub trait ReadBytesExtShort: io::Read { impl ReadBytesExtShort for T where T: ReadBytesExt {} +#[allow(unused)] pub trait WriteBytesExtShort: WriteBytesExt { fn write_u16le(&mut self, n: u16) -> io::Result<()> { self.write_u16::(n) diff --git a/net/aws/src/s3url.rs b/net/aws/src/s3url.rs index 7a9d031f..714d18ea 100644 --- a/net/aws/src/s3url.rs +++ b/net/aws/src/s3url.rs @@ -25,9 +25,10 @@ const FRAGMENT: &AsciiSet = &CONTROLS.add(b' ').add(b'"').add(b'<').add(b'>').ad const PATH: &AsciiSet = &FRAGMENT.add(b'#').add(b'?').add(b'{').add(b'}'); const PATH_SEGMENT: &AsciiSet = &PATH.add(b'/').add(b'%'); -impl ToString for GstS3Url { - fn to_string(&self) -> String { - format!( +impl std::fmt::Display for GstS3Url { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!( + f, "s3://{}/{}/{}{}", self.region, self.bucket, diff --git a/net/aws/src/transcriber/imp.rs b/net/aws/src/transcriber/imp.rs index ff6e4e76..1f34154d 100644 --- a/net/aws/src/transcriber/imp.rs +++ b/net/aws/src/transcriber/imp.rs @@ -534,13 +534,14 @@ impl Transcriber { fn prepare(&self) -> Result<(), gst::ErrorMessage> { gst::debug!(CAT, imp: self, "Preparing"); - let (access_key, secret_access_key, session_token); - { + let (access_key, secret_access_key, session_token) = { let settings = self.settings.lock().unwrap(); - access_key = settings.access_key.to_owned(); - secret_access_key = settings.secret_access_key.to_owned(); - session_token = settings.session_token.to_owned(); - } + ( + settings.access_key.clone(), + settings.secret_access_key.clone(), + settings.session_token.clone(), + ) + }; gst::info!(CAT, imp: self, "Loading aws config..."); let _enter_guard = RUNTIME.enter(); diff --git a/net/hlssink3/src/playlist.rs b/net/hlssink3/src/playlist.rs index 6469dcc3..e1bd650a 100644 --- a/net/hlssink3/src/playlist.rs +++ b/net/hlssink3/src/playlist.rs @@ -59,7 +59,7 @@ impl Playlist { while self.inner.segments.len() > max_playlist_length { let to_remove = self.inner.segments.remove(0); if self.inner.segments[0].map.is_none() { - self.inner.segments[0].map = to_remove.map.clone() + self.inner.segments[0].map.clone_from(&to_remove.map) } } } else if self.inner.segments.len() > max_playlist_length { diff --git a/net/rtp/src/basedepay/mod.rs b/net/rtp/src/basedepay/mod.rs index b345b523..44856f42 100644 --- a/net/rtp/src/basedepay/mod.rs +++ b/net/rtp/src/basedepay/mod.rs @@ -100,6 +100,7 @@ pub trait RtpBaseDepay2Ext: IsA { } /// Finish currently pending buffers and push them downstream in a single buffer list. + #[allow(unused)] fn finish_pending_buffers(&self) -> Result { self.upcast_ref::() .imp() diff --git a/net/rtp/src/basepay/mod.rs b/net/rtp/src/basepay/mod.rs index 5c6ee2f8..dc8fa4fc 100644 --- a/net/rtp/src/basepay/mod.rs +++ b/net/rtp/src/basepay/mod.rs @@ -101,6 +101,7 @@ pub trait RtpBasePay2Ext: IsA { } /// Returns a reference to the src pad. + #[allow(unused)] fn src_pad(&self) -> &gst::Pad { self.upcast_ref::().imp().src_pad() } diff --git a/net/webrtc/signalling/src/server/mod.rs b/net/webrtc/signalling/src/server/mod.rs index 3b17fd3d..e3fb2848 100644 --- a/net/webrtc/signalling/src/server/mod.rs +++ b/net/webrtc/signalling/src/server/mod.rs @@ -44,14 +44,10 @@ impl Server { I: for<'a> Deserialize<'a>, O: Serialize + std::fmt::Debug + Send + Sync, Factory: FnOnce(Pin)> + Send>>) -> St, - St: Stream, + St: Stream + Send + Unpin + 'static, >( factory: Factory, - ) -> Self - where - O: Serialize + std::fmt::Debug, - St: Send + Unpin + 'static, - { + ) -> Self { let (tx, rx) = mpsc::channel::<(String, Option)>(1000); let mut handler = factory(Box::pin(rx.filter_map(|(peer_id, msg)| async move { if let Some(msg) = msg { @@ -119,10 +115,10 @@ impl Server { } #[instrument(level = "debug", skip(self, stream))] - pub async fn accept_async(&mut self, stream: S) -> Result - where - S: AsyncRead + AsyncWrite + Unpin + Send, - { + pub async fn accept_async( + &mut self, + stream: S, + ) -> Result { let ws = match async_tungstenite::tokio::accept_async(stream).await { Ok(ws) => ws, Err(err) => { diff --git a/net/webrtc/src/janusvr_signaller/imp.rs b/net/webrtc/src/janusvr_signaller/imp.rs index 9cdd30ac..c9afcad1 100644 --- a/net/webrtc/src/janusvr_signaller/imp.rs +++ b/net/webrtc/src/janusvr_signaller/imp.rs @@ -606,7 +606,7 @@ impl Signaller { return; } - state.room_id = settings.room_id.clone(); + state.room_id.clone_from(&settings.room_id); ( state.transaction_id.clone().unwrap(), diff --git a/net/webrtc/src/webrtcsink/imp.rs b/net/webrtc/src/webrtcsink/imp.rs index 847352e9..3d8ec849 100644 --- a/net/webrtc/src/webrtcsink/imp.rs +++ b/net/webrtc/src/webrtcsink/imp.rs @@ -3006,7 +3006,7 @@ impl BaseWebRTCSink { if let Some(congestion_controller) = session.congestion_controller.as_mut() { congestion_controller.loss_control(element, stats, &mut session.encoders); } - session.stats = stats.to_owned(); + stats.clone_into(&mut session.stats); } } diff --git a/net/webrtc/src/whip_signaller/imp.rs b/net/webrtc/src/whip_signaller/imp.rs index 9f7adc4f..b3b41996 100644 --- a/net/webrtc/src/whip_signaller/imp.rs +++ b/net/webrtc/src/whip_signaller/imp.rs @@ -668,11 +668,6 @@ impl Default for WhipServer { } } -#[derive(Debug)] -struct InternalError; - -impl warp::reject::Reject for InternalError {} - impl WhipServer { pub fn on_webrtcbin_ready(&self) -> RustClosure { glib::closure!(|signaller: &super::WhipServerSignaller, diff --git a/video/closedcaption/src/cea708utils.rs b/video/closedcaption/src/cea708utils.rs index 179648f2..9f3f855b 100644 --- a/video/closedcaption/src/cea708utils.rs +++ b/video/closedcaption/src/cea708utils.rs @@ -1322,7 +1322,7 @@ impl Window { height as u32, gst_video::VideoOverlayFormatFlags::PREMULTIPLIED_ALPHA, )); - self.rectangle = ret.clone(); + self.rectangle.clone_from(&ret); ret } }