From 09db28bbf5e3a471a466325bac6fbf8d03a58332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Wed, 2 Aug 2017 19:40:31 +0300
Subject: [PATCH] Fix various clippy warnings

---
 gstreamer/src/bin.rs        |  4 ++--
 gstreamer/src/buffer.rs     | 16 ++++++++--------
 gstreamer/src/bufferlist.rs |  2 +-
 gstreamer/src/bus.rs        |  2 +-
 gstreamer/src/caps.rs       |  4 ++--
 gstreamer/src/element.rs    |  2 +-
 gstreamer/src/event.rs      |  2 +-
 gstreamer/src/message.rs    |  2 +-
 gstreamer/src/pad.rs        |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gstreamer/src/bin.rs b/gstreamer/src/bin.rs
index da6ce41d6..742d7a0b6 100644
--- a/gstreamer/src/bin.rs
+++ b/gstreamer/src/bin.rs
@@ -32,7 +32,7 @@ impl<O: IsA<Bin>> BinExtManual for O {
             }
         }
 
-        return Ok(());
+        Ok(())
     }
 
     fn remove_many<E: IsA<Element>>(&self, elements: &[&E]) -> Result<(), glib::BoolError> {
@@ -48,6 +48,6 @@ impl<O: IsA<Bin>> BinExtManual for O {
             }
         }
 
-        return Ok(());
+        Ok(())
     }
 }
diff --git a/gstreamer/src/buffer.rs b/gstreamer/src/buffer.rs
index c34c30059..79b389f2e 100644
--- a/gstreamer/src/buffer.rs
+++ b/gstreamer/src/buffer.rs
@@ -108,41 +108,41 @@ impl GstRc<BufferRef> {
         }
     }
 
-    pub fn into_read_mapped_buffer(buffer: Self) -> Result<ReadMappedBuffer, Self> {
+    pub fn into_read_mapped_buffer(self) -> Result<ReadMappedBuffer, Self> {
         let mut map_info: ffi::GstMapInfo = unsafe { mem::zeroed() };
         let res: bool = unsafe {
             from_glib(ffi::gst_buffer_map(
-                buffer.as_mut_ptr(),
+                self.as_mut_ptr(),
                 &mut map_info,
                 ffi::GST_MAP_READ,
             ))
         };
         if res {
             Ok(ReadMappedBuffer {
-                buffer: buffer,
+                buffer: self,
                 map_info: map_info,
             })
         } else {
-            Err(buffer)
+            Err(self)
         }
     }
 
-    pub fn into_readwrite_mapped_buffer(buffer: Self) -> Result<ReadWriteMappedBuffer, Self> {
+    pub fn into_readwrite_mapped_buffer(self) -> Result<ReadWriteMappedBuffer, Self> {
         let mut map_info: ffi::GstMapInfo = unsafe { mem::zeroed() };
         let res: bool = unsafe {
             from_glib(ffi::gst_buffer_map(
-                buffer.as_mut_ptr(),
+                self.as_mut_ptr(),
                 &mut map_info,
                 ffi::GST_MAP_READWRITE,
             ))
         };
         if res {
             Ok(ReadWriteMappedBuffer {
-                buffer: buffer,
+                buffer: self,
                 map_info: map_info,
             })
         } else {
-            Err(buffer)
+            Err(self)
         }
     }
 
diff --git a/gstreamer/src/bufferlist.rs b/gstreamer/src/bufferlist.rs
index f96ced2c0..4726e897f 100644
--- a/gstreamer/src/bufferlist.rs
+++ b/gstreamer/src/bufferlist.rs
@@ -68,7 +68,7 @@ impl BufferListRef {
         unsafe { ffi::gst_buffer_list_length(self.as_mut_ptr()) as usize }
     }
 
-    pub fn iter<'a>(&'a self) -> Iter<'a> {
+    pub fn iter(&self) -> Iter {
         Iter::new(self)
     }
 }
diff --git a/gstreamer/src/bus.rs b/gstreamer/src/bus.rs
index 14c290548..368098f11 100644
--- a/gstreamer/src/bus.rs
+++ b/gstreamer/src/bus.rs
@@ -47,7 +47,7 @@ unsafe extern "C" fn trampoline_sync(
     func: gpointer,
 ) -> ffi::GstBusSyncReply {
     let _guard = CallbackGuard::new();
-    let f: &Box<Fn(&Bus, &Message) -> BusSyncReply + 'static> = transmute(func);
+    let f: &&(Fn(&Bus, &Message) -> BusSyncReply + 'static) = transmute(func);
     f(&from_glib_none(bus), &Message::from_glib_none(msg)).to_glib()
 }
 
diff --git a/gstreamer/src/caps.rs b/gstreamer/src/caps.rs
index 83a560012..157b9a3b6 100644
--- a/gstreamer/src/caps.rs
+++ b/gstreamer/src/caps.rs
@@ -105,7 +105,7 @@ impl str::FromStr for Caps {
 
 impl CapsRef {
     pub fn set_simple(&mut self, values: &[(&str, &ToValue)]) {
-        for &(name, ref value) in values {
+        for &(name, value) in values {
             let value = value.to_value();
 
             unsafe {
@@ -135,7 +135,7 @@ impl CapsRef {
         }
     }
 
-    pub fn get_mut_structure<'a>(&'a mut self, idx: u32) -> Option<&'a mut StructureRef> {
+    pub fn get_mut_structure(&mut self, idx: u32) -> Option<&mut StructureRef> {
         unsafe {
             let structure = ffi::gst_caps_get_structure(self.as_ptr(), idx);
             if structure.is_null() {
diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs
index bca494dec..c61b0afcb 100644
--- a/gstreamer/src/element.rs
+++ b/gstreamer/src/element.rs
@@ -31,7 +31,7 @@ impl Element {
             }
         }
 
-        return Ok(());
+        Ok(())
     }
 
     pub fn unlink_many<E: IsA<Element>>(elements: &[&E]) {
diff --git a/gstreamer/src/event.rs b/gstreamer/src/event.rs
index 5bd5aae10..05aee4914 100644
--- a/gstreamer/src/event.rs
+++ b/gstreamer/src/event.rs
@@ -342,7 +342,7 @@ impl<'a> StreamStart<'a> {
             if stream_id.is_null() {
                 None
             } else {
-                Some((CStr::from_ptr(stream_id).to_str().unwrap()))
+                Some(CStr::from_ptr(stream_id).to_str().unwrap())
             }
         }
     }
diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs
index 86b4ed565..6d90fe2a4 100644
--- a/gstreamer/src/message.rs
+++ b/gstreamer/src/message.rs
@@ -1070,7 +1070,7 @@ impl<'a> Redirect<'a> {
 
 macro_rules! message_builder_generic_impl {
     ($new_fn:expr) => {
-        pub fn src<'b, T: IsA<Object> + Cast + Clone>(self, src: Option<&'b T>) -> Self {
+        pub fn src<T: IsA<Object> + Cast + Clone>(self, src: Option<&T>) -> Self {
             Self {
                 src: src.map(|o| {
                     let o = (*o).clone();
diff --git a/gstreamer/src/pad.rs b/gstreamer/src/pad.rs
index f2323c6bd..1a518d16f 100644
--- a/gstreamer/src/pad.rs
+++ b/gstreamer/src/pad.rs
@@ -254,7 +254,7 @@ unsafe extern "C" fn trampoline_pad_probe(
     func: gpointer,
 ) -> ffi::GstPadProbeReturn {
     let _guard = CallbackGuard::new();
-    let func: &Box<Fn(&Pad, &mut PadProbeInfo) -> PadProbeReturn + Send + Sync + 'static> =
+    let func: &&(Fn(&Pad, &mut PadProbeInfo) -> PadProbeReturn + Send + Sync + 'static) =
         transmute(func);
     let mut data_type = None;