From e2264a3f3f8eb4af3a3331699e281d7b4a40b67c Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume.gomez@huawei.com>
Date: Fri, 30 Jul 2021 21:23:46 +0200
Subject: [PATCH] Fix (new) clippy warnings

---
 .gitlab-ci.yml                        | 2 +-
 examples/src/bin/debug_ringbuffer.rs  | 2 +-
 examples/src/bin/thumbnail.rs         | 2 +-
 examples/src/glupload.rs              | 1 +
 gstreamer-app/src/lib.rs              | 1 +
 gstreamer-audio/src/lib.rs            | 1 +
 gstreamer-base/src/lib.rs             | 1 +
 gstreamer-check/src/lib.rs            | 1 +
 gstreamer-controller/src/lib.rs       | 1 +
 gstreamer-editing-services/src/lib.rs | 1 +
 gstreamer-gl/egl/src/lib.rs           | 1 +
 gstreamer-gl/src/lib.rs               | 1 +
 gstreamer-gl/wayland/src/lib.rs       | 1 +
 gstreamer-gl/x11/src/lib.rs           | 1 +
 gstreamer-net/src/lib.rs              | 1 +
 gstreamer-pbutils/src/lib.rs          | 1 +
 gstreamer-player/src/lib.rs           | 1 +
 gstreamer-rtp/src/lib.rs              | 1 +
 gstreamer-rtsp-server/src/lib.rs      | 1 +
 gstreamer-rtsp/src/lib.rs             | 1 +
 gstreamer-sdp/src/lib.rs              | 1 +
 gstreamer-video/src/lib.rs            | 1 +
 gstreamer-webrtc/src/lib.rs           | 1 +
 gstreamer/src/caps_features_serde.rs  | 6 +++---
 gstreamer/src/caps_serde.rs           | 8 ++++----
 gstreamer/src/date_time_serde.rs      | 2 ++
 gstreamer/src/lib.rs                  | 2 ++
 gstreamer/src/structure_serde.rs      | 2 ++
 gstreamer/src/tags_serde.rs           | 4 +++-
 gstreamer/src/value_serde.rs          | 2 ++
 30 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e19f02bb9..725381885 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -347,7 +347,7 @@ clippy:
   extends: .img-stable
   stage: 'extras'
   variables:
-    CLIPPY_LINTS: -A clippy::missing_safety_doc -A clippy::manual_range_contains -A clippy::upper_case_acronyms -A clippy::wrong_self_convention -D warnings
+    CLIPPY_LINTS: -D warnings
   script:
     - cargo clippy --version
       # Keep features in sync with above
diff --git a/examples/src/bin/debug_ringbuffer.rs b/examples/src/bin/debug_ringbuffer.rs
index a3284ca7f..d9b8a6578 100644
--- a/examples/src/bin/debug_ringbuffer.rs
+++ b/examples/src/bin/debug_ringbuffer.rs
@@ -28,7 +28,7 @@ fn example_main() {
 
     let mut context = gst::ParseContext::new();
     let pipeline =
-        match gst::parse_launch_full(&pipeline_str, Some(&mut context), gst::ParseFlags::empty()) {
+        match gst::parse_launch_full(pipeline_str, Some(&mut context), gst::ParseFlags::empty()) {
             Ok(pipeline) => pipeline,
             Err(err) => {
                 if let Some(gst::ParseError::NoSuchElement) = err.kind::<gst::ParseError>() {
diff --git a/examples/src/bin/thumbnail.rs b/examples/src/bin/thumbnail.rs
index 017414ef3..5b56ee5df 100644
--- a/examples/src/bin/thumbnail.rs
+++ b/examples/src/bin/thumbnail.rs
@@ -79,7 +79,7 @@ fn create_pipeline(uri: String, out_path: std::path::PathBuf) -> Result<gst::Pip
                 })?;
 
                 let caps = sample.caps().expect("Sample without caps");
-                let info = gst_video::VideoInfo::from_caps(&caps).expect("Failed to parse caps");
+                let info = gst_video::VideoInfo::from_caps(caps).expect("Failed to parse caps");
 
                 // Make sure that we only get a single buffer
                 if got_snapshot {
diff --git a/examples/src/glupload.rs b/examples/src/glupload.rs
index a940cf06d..1bb4ffc79 100644
--- a/examples/src/glupload.rs
+++ b/examples/src/glupload.rs
@@ -75,6 +75,7 @@ void main() {
 #[allow(clippy::unused_unit)]
 #[allow(clippy::too_many_arguments)]
 #[allow(clippy::manual_non_exhaustive)]
+#[allow(clippy::upper_case_acronyms)]
 pub(crate) mod gl {
     pub use self::Gles2 as Gl;
     include!(concat!(env!("OUT_DIR"), "/test_gl_bindings.rs"));
diff --git a/gstreamer-app/src/lib.rs b/gstreamer-app/src/lib.rs
index b1b009f21..eeb8ba67d 100644
--- a/gstreamer-app/src/lib.rs
+++ b/gstreamer-app/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs
index fb06790e1..b14bf5b99 100644
--- a/gstreamer-audio/src/lib.rs
+++ b/gstreamer-audio/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-base/src/lib.rs b/gstreamer-base/src/lib.rs
index 1617bf004..98588d044 100644
--- a/gstreamer-base/src/lib.rs
+++ b/gstreamer-base/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-check/src/lib.rs b/gstreamer-check/src/lib.rs
index 9a65f579c..b570f1839 100644
--- a/gstreamer-check/src/lib.rs
+++ b/gstreamer-check/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-controller/src/lib.rs b/gstreamer-controller/src/lib.rs
index 5168e7ad1..5ff1be1bd 100644
--- a/gstreamer-controller/src/lib.rs
+++ b/gstreamer-controller/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-editing-services/src/lib.rs b/gstreamer-editing-services/src/lib.rs
index 37f5e55a6..ebead2a76 100644
--- a/gstreamer-editing-services/src/lib.rs
+++ b/gstreamer-editing-services/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-gl/egl/src/lib.rs b/gstreamer-gl/egl/src/lib.rs
index a9e8a4bd9..88f243833 100644
--- a/gstreamer-gl/egl/src/lib.rs
+++ b/gstreamer-gl/egl/src/lib.rs
@@ -7,6 +7,7 @@
 // except according to those terms.
 
 #![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 
 pub use ffi;
 pub use gst_gl;
diff --git a/gstreamer-gl/src/lib.rs b/gstreamer-gl/src/lib.rs
index 9cd3b6d59..3c6450b3a 100644
--- a/gstreamer-gl/src/lib.rs
+++ b/gstreamer-gl/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-gl/wayland/src/lib.rs b/gstreamer-gl/wayland/src/lib.rs
index c04c962f4..b265d447e 100644
--- a/gstreamer-gl/wayland/src/lib.rs
+++ b/gstreamer-gl/wayland/src/lib.rs
@@ -7,6 +7,7 @@
 // except according to those terms.
 
 #![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 
 pub use ffi;
 pub use gst_gl;
diff --git a/gstreamer-gl/x11/src/lib.rs b/gstreamer-gl/x11/src/lib.rs
index b529fd466..ff3625b14 100644
--- a/gstreamer-gl/x11/src/lib.rs
+++ b/gstreamer-gl/x11/src/lib.rs
@@ -7,6 +7,7 @@
 // except according to those terms.
 
 #![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 
 pub use ffi;
 pub use gst_gl;
diff --git a/gstreamer-net/src/lib.rs b/gstreamer-net/src/lib.rs
index 793ea65ac..33567deaa 100644
--- a/gstreamer-net/src/lib.rs
+++ b/gstreamer-net/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-pbutils/src/lib.rs b/gstreamer-pbutils/src/lib.rs
index c59410bb1..2bcbb7e15 100644
--- a/gstreamer-pbutils/src/lib.rs
+++ b/gstreamer-pbutils/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-player/src/lib.rs b/gstreamer-player/src/lib.rs
index 770d7e324..c85a84e12 100644
--- a/gstreamer-player/src/lib.rs
+++ b/gstreamer-player/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-rtp/src/lib.rs b/gstreamer-rtp/src/lib.rs
index dd79502bd..13afa7093 100644
--- a/gstreamer-rtp/src/lib.rs
+++ b/gstreamer-rtp/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::manual_range_contains)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-rtsp-server/src/lib.rs b/gstreamer-rtsp-server/src/lib.rs
index c38ad7cda..ac2957472 100644
--- a/gstreamer-rtsp-server/src/lib.rs
+++ b/gstreamer-rtsp-server/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-rtsp/src/lib.rs b/gstreamer-rtsp/src/lib.rs
index 881ffcf9d..bb0ac8a49 100644
--- a/gstreamer-rtsp/src/lib.rs
+++ b/gstreamer-rtsp/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-sdp/src/lib.rs b/gstreamer-sdp/src/lib.rs
index 4bd960d8c..8bf493165 100644
--- a/gstreamer-sdp/src/lib.rs
+++ b/gstreamer-sdp/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs
index 57067953b..fbf667222 100644
--- a/gstreamer-video/src/lib.rs
+++ b/gstreamer-video/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer-webrtc/src/lib.rs b/gstreamer-webrtc/src/lib.rs
index 661fe6e40..beb885a0e 100644
--- a/gstreamer-webrtc/src/lib.rs
+++ b/gstreamer-webrtc/src/lib.rs
@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gstreamer/src/caps_features_serde.rs b/gstreamer/src/caps_features_serde.rs
index f76df3c0f..372f1cb8c 100644
--- a/gstreamer/src/caps_features_serde.rs
+++ b/gstreamer/src/caps_features_serde.rs
@@ -20,8 +20,8 @@ const CAPS_FEATURES_VARIANT_SOME_ID: u32 = 1;
 const CAPS_FEATURES_VARIANT_SOME_STR: &str = "Some";
 
 const CAPS_FEATURES_VARIANT_NAMES: &[&str] = &[
-    &CAPS_FEATURES_VARIANT_ANY_STR,
-    &CAPS_FEATURES_VARIANT_SOME_STR,
+    CAPS_FEATURES_VARIANT_ANY_STR,
+    CAPS_FEATURES_VARIANT_SOME_STR,
 ];
 
 struct CapsFeaturesForIterSe<'a>(&'a CapsFeaturesRef);
@@ -55,7 +55,7 @@ impl Serialize for CapsFeaturesRef {
                 stringify!(CapsFeatures),
                 CAPS_FEATURES_VARIANT_SOME_ID,
                 CAPS_FEATURES_VARIANT_SOME_STR,
-                &CapsFeaturesForIterSe(&self),
+                &CapsFeaturesForIterSe(self),
             )
         }
     }
diff --git a/gstreamer/src/caps_serde.rs b/gstreamer/src/caps_serde.rs
index a9c7720d0..c90e81fbd 100644
--- a/gstreamer/src/caps_serde.rs
+++ b/gstreamer/src/caps_serde.rs
@@ -27,9 +27,9 @@ const CAPS_VARIANT_SOME_ID: u32 = 2;
 const CAPS_VARIANT_SOME_STR: &str = "Some";
 
 const CAPS_VARIANT_NAMES: &[&str] = &[
-    &CAPS_VARIANT_ANY_STR,
-    &CAPS_VARIANT_EMPTY_STR,
-    &CAPS_VARIANT_SOME_STR,
+    CAPS_VARIANT_ANY_STR,
+    CAPS_VARIANT_EMPTY_STR,
+    CAPS_VARIANT_SOME_STR,
 ];
 
 struct CapsItemSe<'a>(&'a StructureRef, Option<&'a CapsFeaturesRef>);
@@ -86,7 +86,7 @@ impl Serialize for CapsRef {
                 stringify!(Caps),
                 CAPS_VARIANT_SOME_ID,
                 CAPS_VARIANT_SOME_STR,
-                &CapsForIterSe(&self),
+                &CapsForIterSe(self),
             )
         }
     }
diff --git a/gstreamer/src/date_time_serde.rs b/gstreamer/src/date_time_serde.rs
index 8eea7694c..470a4ed2c 100644
--- a/gstreamer/src/date_time_serde.rs
+++ b/gstreamer/src/date_time_serde.rs
@@ -1,5 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#![allow(clippy::upper_case_acronyms)]
+
 use std::convert::{TryFrom, TryInto};
 
 use glib::translate::{FromGlib, IntoGlib};
diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs
index 309b582c6..8ddaf9957 100644
--- a/gstreamer/src/lib.rs
+++ b/gstreamer/src/lib.rs
@@ -2,6 +2,8 @@
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 #![recursion_limit = "256"]
+#![allow(clippy::missing_safety_doc)]
+#![allow(clippy::manual_range_contains)]
 #![doc = include_str!("../README.md")]
 
 // Re-exported for the subclass gst_plugin_define! macro
diff --git a/gstreamer/src/structure_serde.rs b/gstreamer/src/structure_serde.rs
index 06fb45110..9c3d399c5 100644
--- a/gstreamer/src/structure_serde.rs
+++ b/gstreamer/src/structure_serde.rs
@@ -1,5 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#![allow(clippy::upper_case_acronyms)]
+
 use glib::{Date, ToValue};
 
 use serde::de;
diff --git a/gstreamer/src/tags_serde.rs b/gstreamer/src/tags_serde.rs
index 28798a376..f8c79dead 100644
--- a/gstreamer/src/tags_serde.rs
+++ b/gstreamer/src/tags_serde.rs
@@ -1,5 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#![allow(clippy::upper_case_acronyms)]
+
 use glib::translate::{from_glib, ToGlibPtr};
 use glib::{Date, SendValue, ToValue};
 
@@ -104,7 +106,7 @@ impl<'a> Serialize for TagsSer<'a> {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         let mut tup = serializer.serialize_tuple(2)?;
         tup.serialize_element(self.0)?;
-        tup.serialize_element(&TagValuesSer::from(&self))?;
+        tup.serialize_element(&TagValuesSer::from(self))?;
         tup.end()
     }
 }
diff --git a/gstreamer/src/value_serde.rs b/gstreamer/src/value_serde.rs
index c3d6dc03b..54d34a37f 100644
--- a/gstreamer/src/value_serde.rs
+++ b/gstreamer/src/value_serde.rs
@@ -1,5 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#![allow(clippy::upper_case_acronyms)]
+
 use glib::{Date, StaticType, ToValue};
 
 use num_rational::Rational32;