From cba662934ce646703d4c1fb63aea044d83255bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 26 Sep 2017 01:58:19 +0300 Subject: [PATCH] Get rid of various clippy warnings --- gst-plugin/src/demuxer.rs | 12 ++++++------ gst-plugin/src/lib.rs | 14 ++++++-------- gst-plugin/src/object.rs | 2 +- gst-plugin/src/source.rs | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gst-plugin/src/demuxer.rs b/gst-plugin/src/demuxer.rs index f1efb288..ab6bb58b 100644 --- a/gst-plugin/src/demuxer.rs +++ b/gst-plugin/src/demuxer.rs @@ -146,7 +146,7 @@ impl Demuxer { flow_combiner: Mutex::new(Default::default()), group_id: Mutex::new(gst::util_group_id_next()), srcpads: Mutex::new(BTreeMap::new()), - imp: Mutex::new(((demuxer_info.create_instance)(demuxer))), + imp: Mutex::new((demuxer_info.create_instance)(demuxer)), } } @@ -345,7 +345,7 @@ impl Demuxer { ) -> bool { let element = parent .as_ref() - .map(|o| o.clone()) + .cloned() .unwrap() .downcast::() .unwrap(); @@ -390,7 +390,7 @@ impl Demuxer { ) -> gst::FlowReturn { let element = parent .as_ref() - .map(|o| o.clone()) + .cloned() .unwrap() .downcast::() .unwrap(); @@ -488,7 +488,7 @@ impl Demuxer { let element = parent .as_ref() - .map(|o| o.clone()) + .cloned() .unwrap() .downcast::() .unwrap(); @@ -523,7 +523,7 @@ impl Demuxer { let element = parent .as_ref() - .map(|o| o.clone()) + .cloned() .unwrap() .downcast::() .unwrap(); @@ -630,7 +630,7 @@ impl Demuxer { gst_debug!(self.cat, obj: element, "Seeked after EOS"); *offset = u64::MAX; - self.stream_eos(&element, None); + self.stream_eos(element, None); true } diff --git a/gst-plugin/src/lib.rs b/gst-plugin/src/lib.rs index 921b9e1f..b323e302 100644 --- a/gst-plugin/src/lib.rs +++ b/gst-plugin/src/lib.rs @@ -39,14 +39,12 @@ macro_rules! floating_reference_guard { pub struct FloatingReferenceGuard(*mut gobject_ffi::GObject); impl FloatingReferenceGuard { - pub fn new(obj: *mut gobject_ffi::GObject) -> Option { - unsafe { - if gobject_ffi::g_object_is_floating(obj) != glib_ffi::GFALSE { - gobject_ffi::g_object_ref_sink(obj); - Some(FloatingReferenceGuard(obj)) - } else { - None - } + pub unsafe fn new(obj: *mut gobject_ffi::GObject) -> Option { + if gobject_ffi::g_object_is_floating(obj) != glib_ffi::GFALSE { + gobject_ffi::g_object_ref_sink(obj); + Some(FloatingReferenceGuard(obj)) + } else { + None } } } diff --git a/gst-plugin/src/object.rs b/gst-plugin/src/object.rs index cb49f4c0..b9d4e108 100644 --- a/gst-plugin/src/object.rs +++ b/gst-plugin/src/object.rs @@ -142,7 +142,7 @@ impl ClassStruct { return ptr::null_mut(); } - for &(t, p) in (*self.interfaces_static).iter() { + for &(t, p) in &(*self.interfaces_static) { if t == type_ { return p; } diff --git a/gst-plugin/src/source.rs b/gst-plugin/src/source.rs index 1a81ff6b..66ba4b9b 100644 --- a/gst-plugin/src/source.rs +++ b/gst-plugin/src/source.rs @@ -278,7 +278,7 @@ impl BaseSrcImpl for Source { let start = segment.get_start(); let stop = match segment.get_stop() { u64::MAX => None, - stop @ _ => Some(stop), + stop => Some(stop), }; gst_debug!(self.cat, obj: src, "Seeking to {:?}-{:?}", start, stop);