From 872024c372924467fc5be2204e4f7d4b28b2368c Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.com>
Date: Mon, 20 Apr 2020 17:16:23 +0200
Subject: [PATCH] fix option_as_ref_deref clippy warnings

---
 gstreamer-base/src/subclass/base_src.rs | 9 +--------
 gstreamer/src/pad.rs                    | 4 +---
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/gstreamer-base/src/subclass/base_src.rs b/gstreamer-base/src/subclass/base_src.rs
index c629463bb..1bf4195be 100644
--- a/gstreamer-base/src/subclass/base_src.rs
+++ b/gstreamer-base/src/subclass/base_src.rs
@@ -771,8 +771,6 @@ where
     T: BaseSrcImpl,
     T::Instance: PanicPoison,
 {
-    use std::ops::DerefMut;
-
     let instance = &*(ptr as *mut T::Instance);
     let imp = instance.get_impl();
     let wrap: Borrowed<BaseSrc> = from_glib_borrow(ptr);
@@ -787,12 +785,7 @@ where
     };
 
     gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
-        match imp.create(
-            &wrap,
-            offset,
-            buffer.as_mut().map(|b| b.deref_mut()),
-            length,
-        ) {
+        match imp.create(&wrap, offset, buffer.as_deref_mut(), length) {
             Ok(CreateSuccess::NewBuffer(new_buffer)) => {
                 if let Some(passed_buffer) = buffer {
                     if passed_buffer.as_ptr() != new_buffer.as_ptr() {
diff --git a/gstreamer/src/pad.rs b/gstreamer/src/pad.rs
index 4fcf62808..e5d868763 100644
--- a/gstreamer/src/pad.rs
+++ b/gstreamer/src/pad.rs
@@ -1397,8 +1397,6 @@ unsafe extern "C" fn trampoline_getrange_function<
 where
     T: IsA<Pad>,
 {
-    use std::ops::DerefMut;
-
     let func: &F = &*((*pad).getrangedata as *const F);
 
     assert!(!buffer.is_null());
@@ -1417,7 +1415,7 @@ where
             .as_ref()
             .as_ref(),
         offset,
-        passed_buffer.as_mut().map(|b| b.deref_mut()),
+        passed_buffer.as_deref_mut(),
         length,
     ) {
         Ok(PadGetRangeSuccess::NewBuffer(new_buffer)) => {