From a36fe2a3f544dc5f373b486cc996b3eec4253899 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Thu, 29 Apr 2021 22:49:03 +0200 Subject: [PATCH] base: Fix all clippy::use_self warnings --- gstreamer-base/src/adapter.rs | 4 ++-- gstreamer-base/src/base_parse_frame.rs | 21 +++++++++------------ gstreamer-base/src/flow_combiner.rs | 6 +++--- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/gstreamer-base/src/adapter.rs b/gstreamer-base/src/adapter.rs index 42b8115b1..15a04ac1e 100644 --- a/gstreamer-base/src/adapter.rs +++ b/gstreamer-base/src/adapter.rs @@ -256,8 +256,8 @@ unsafe impl Send for UniqueAdapter {} unsafe impl Sync for UniqueAdapter {} impl UniqueAdapter { - pub fn new() -> UniqueAdapter { - UniqueAdapter(Adapter::new()) + pub fn new() -> Self { + Self(Adapter::new()) } pub fn available(&self) -> usize { diff --git a/gstreamer-base/src/base_parse_frame.rs b/gstreamer-base/src/base_parse_frame.rs index deff09ec8..36f926c66 100644 --- a/gstreamer-base/src/base_parse_frame.rs +++ b/gstreamer-base/src/base_parse_frame.rs @@ -30,21 +30,21 @@ impl IntoGlib for Overhead { fn into_glib(self) -> i32 { match self { - Overhead::None => 0, - Overhead::Frame => -1, - Overhead::Bytes(b) => i32::try_from(b).expect("overhead is higher than i32::MAX"), + Self::None => 0, + Self::Frame => -1, + Self::Bytes(b) => i32::try_from(b).expect("overhead is higher than i32::MAX"), } } } impl FromGlib for Overhead { #[inline] - unsafe fn from_glib(val: i32) -> Overhead { + unsafe fn from_glib(val: i32) -> Self { skip_assert_initialized!(); match val { - 0 => Overhead::None, - 1 => Overhead::Frame, - b if b > 0 => Overhead::Bytes(val as u32), + 0 => Self::None, + 1 => Self::Frame, + b if b > 0 => Self::Bytes(val as u32), _ => panic!("overheader is lower than -1"), } } @@ -78,13 +78,10 @@ impl<'a> fmt::Debug for BaseParseFrame<'a> { } impl<'a> BaseParseFrame<'a> { - pub(crate) unsafe fn new( - frame: *mut ffi::GstBaseParseFrame, - _parse: &'a BaseParse, - ) -> BaseParseFrame<'a> { + pub(crate) unsafe fn new(frame: *mut ffi::GstBaseParseFrame, _parse: &'a BaseParse) -> Self { skip_assert_initialized!(); assert!(!frame.is_null()); - BaseParseFrame(ptr::NonNull::new_unchecked(frame), PhantomData) + Self(ptr::NonNull::new_unchecked(frame), PhantomData) } pub fn buffer(&self) -> Option<&gst::BufferRef> { diff --git a/gstreamer-base/src/flow_combiner.rs b/gstreamer-base/src/flow_combiner.rs index d84fad823..0cb2698ae 100644 --- a/gstreamer-base/src/flow_combiner.rs +++ b/gstreamer-base/src/flow_combiner.rs @@ -31,7 +31,7 @@ glib::wrapper! { } impl FlowCombiner { - pub fn new() -> FlowCombiner { + pub fn new() -> Self { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_flow_combiner_new()) } } @@ -104,8 +104,8 @@ unsafe impl Sync for UniqueFlowCombiner {} unsafe impl Send for UniqueFlowCombiner {} impl UniqueFlowCombiner { - pub fn new() -> UniqueFlowCombiner { - UniqueFlowCombiner(FlowCombiner::new()) + pub fn new() -> Self { + Self(FlowCombiner::new()) } pub fn add_pad>(&mut self, pad: &P) {