From 1eb0c483fed5cd43ffdda56cad65e4eec09ad724 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Thu, 29 Apr 2021 22:52:33 +0200
Subject: [PATCH] gstreamer: Fix some clippy::use_self warnings

---
 gstreamer/src/format.rs               | 44 +++++++++++++--------------
 gstreamer/src/subclass/element.rs     |  9 ++----
 gstreamer/src/subclass/uri_handler.rs |  2 +-
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/gstreamer/src/format.rs b/gstreamer/src/format.rs
index e0a84a805..b122bc73c 100644
--- a/gstreamer/src/format.rs
+++ b/gstreamer/src/format.rs
@@ -78,55 +78,53 @@ impl GenericFormattedValue {
     pub fn new(format: Format, value: i64) -> Self {
         skip_assert_initialized!();
         match format {
-            Format::Undefined => GenericFormattedValue::Undefined(Undefined(value)),
-            Format::Default => GenericFormattedValue::Default(if value == -1 {
+            Format::Undefined => Self::Undefined(Undefined(value)),
+            Format::Default => Self::Default(if value == -1 {
                 Default(None)
             } else {
                 Default(Some(value as u64))
             }),
-            Format::Bytes => GenericFormattedValue::Bytes(if value == -1 {
+            Format::Bytes => Self::Bytes(if value == -1 {
                 Bytes(None)
             } else {
                 Bytes(Some(value as u64))
             }),
-            Format::Time => GenericFormattedValue::Time(if value == -1 {
+            Format::Time => Self::Time(if value == -1 {
                 ClockTime::none()
             } else {
                 ClockTime::from_nseconds(value as u64)
             }),
-            Format::Buffers => GenericFormattedValue::Buffers(if value == -1 {
+            Format::Buffers => Self::Buffers(if value == -1 {
                 Buffers(None)
             } else {
                 Buffers(Some(value as u64))
             }),
-            Format::Percent => {
-                GenericFormattedValue::Percent(unsafe { Percent::from_raw(format, value) })
-            }
-            Format::__Unknown(_) => GenericFormattedValue::Other(format, value),
+            Format::Percent => Self::Percent(unsafe { Percent::from_raw(format, value) }),
+            Format::__Unknown(_) => Self::Other(format, value),
         }
     }
 
     pub fn format(&self) -> Format {
         match *self {
-            GenericFormattedValue::Undefined(_) => Format::Undefined,
-            GenericFormattedValue::Default(_) => Format::Default,
-            GenericFormattedValue::Bytes(_) => Format::Bytes,
-            GenericFormattedValue::Time(_) => Format::Time,
-            GenericFormattedValue::Buffers(_) => Format::Buffers,
-            GenericFormattedValue::Percent(_) => Format::Percent,
-            GenericFormattedValue::Other(f, _) => f,
+            Self::Undefined(_) => Format::Undefined,
+            Self::Default(_) => Format::Default,
+            Self::Bytes(_) => Format::Bytes,
+            Self::Time(_) => Format::Time,
+            Self::Buffers(_) => Format::Buffers,
+            Self::Percent(_) => Format::Percent,
+            Self::Other(f, _) => f,
         }
     }
 
     pub fn value(&self) -> i64 {
         match *self {
-            GenericFormattedValue::Undefined(v) => v.0,
-            GenericFormattedValue::Default(v) => v.map(|v| v as i64).unwrap_or(-1),
-            GenericFormattedValue::Bytes(v) => v.map(|v| v as i64).unwrap_or(-1),
-            GenericFormattedValue::Time(v) => v.map(|v| v as i64).unwrap_or(-1),
-            GenericFormattedValue::Buffers(v) => v.map(|v| v as i64).unwrap_or(-1),
-            GenericFormattedValue::Percent(v) => v.map(i64::from).unwrap_or(-1),
-            GenericFormattedValue::Other(_, v) => v,
+            Self::Undefined(v) => v.0,
+            Self::Default(v) => v.map(|v| v as i64).unwrap_or(-1),
+            Self::Bytes(v) => v.map(|v| v as i64).unwrap_or(-1),
+            Self::Time(v) => v.map(|v| v as i64).unwrap_or(-1),
+            Self::Buffers(v) => v.map(|v| v as i64).unwrap_or(-1),
+            Self::Percent(v) => v.map(i64::from).unwrap_or(-1),
+            Self::Other(_, v) => v,
         }
     }
 }
diff --git a/gstreamer/src/subclass/element.rs b/gstreamer/src/subclass/element.rs
index be9800160..86539f5dc 100644
--- a/gstreamer/src/subclass/element.rs
+++ b/gstreamer/src/subclass/element.rs
@@ -344,9 +344,9 @@ impl<T: ElementImpl> ElementImplExt for T {
     ) -> R {
         unsafe {
             let wrap = parent.as_ref().unwrap().downcast_ref::<Element>().unwrap();
-            assert!(wrap.type_().is_a(T::type_()));
+            assert!(wrap.type_().is_a(Self::type_()));
             let ptr: *mut ffi::GstElement = wrap.to_glib_none().0;
-            let instance = &*(ptr as *mut T::Instance);
+            let instance = &*(ptr as *mut Self::Instance);
             let imp = instance.impl_();
 
             panic_to_error!(wrap, &imp.panicked(), fallback(), {
@@ -399,10 +399,7 @@ unsafe impl<T: ElementImpl> IsSubclassable<T> for Element {
     fn instance_init(instance: &mut glib::subclass::InitializingObject<T>) {
         <glib::Object as IsSubclassable<T>>::instance_init(instance);
 
-        instance.set_instance_data(
-            crate::Element::static_type(),
-            atomic::AtomicBool::new(false),
-        );
+        instance.set_instance_data(Self::static_type(), atomic::AtomicBool::new(false));
     }
 }
 
diff --git a/gstreamer/src/subclass/uri_handler.rs b/gstreamer/src/subclass/uri_handler.rs
index bf3c37274..401452839 100644
--- a/gstreamer/src/subclass/uri_handler.rs
+++ b/gstreamer/src/subclass/uri_handler.rs
@@ -94,7 +94,7 @@ unsafe impl<T: URIHandlerImpl> IsImplementable<T> for URIHandler {
             let protocols = protocols.to_glib_full();
             let data = data.as_mut();
 
-            data.set_class_data(URIHandler::static_type(), CStrV(protocols));
+            data.set_class_data(Self::static_type(), CStrV(protocols));
         }
 
         iface.get_type = Some(uri_handler_get_type::<T>);