Merge pull request #964 from gtk-rs/bilelmoussaoui/clippy-cleanup

sdroege · web-flow · commit 3db3e10c123b · 2023-02-07T13:36:02.000+02:00
clippy cleanup
diff --git a/cairo/src/lib.rs b/cairo/src/lib.rs
@@ -2,8 +2,6 @@
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 #![allow(clippy::missing_safety_doc)]
-#![allow(clippy::wrong_self_convention)]
-#![allow(clippy::non_send_fields_in_send_ty)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/gdk-pixbuf/src/lib.rs b/gdk-pixbuf/src/lib.rs
@@ -8,7 +8,6 @@ pub use gio;
 pub use glib;
 
 #[allow(clippy::too_many_arguments)]
-#[allow(unused_imports)]
 mod auto;
 
 pub mod subclass;
diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/gio/src/action_entry.rs b/gio/src/action_entry.rs
@@ -12,7 +12,9 @@ where
     name: String,
     parameter_type: Option<VariantType>,
     state: Option<Variant>,
+    #[allow(clippy::type_complexity)]
     pub(crate) activate: Option<Box<dyn Fn(&O, &SimpleAction, Option<&Variant>) + 'static>>,
+    #[allow(clippy::type_complexity)]
     pub(crate) change_state: Option<Box<dyn Fn(&O, &SimpleAction, Option<&Variant>) + 'static>>,
 }
 
diff --git a/gio/src/auto/dbus_method_invocation.rs b/gio/src/auto/dbus_method_invocation.rs
@@ -6,7 +6,10 @@
 #[cfg_attr(feature = "dox", doc(cfg(unix)))]
 use crate::UnixFDList;
 use crate::{DBusConnection, DBusMessage, DBusMethodInfo, DBusPropertyInfo};
-use glib::{prelude::*, translate::*};
+#[cfg(any(unix, feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(unix)))]
+use glib::prelude::*;
+use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gio/src/auto/desktop_app_info.rs b/gio/src/auto/desktop_app_info.rs
@@ -237,7 +237,7 @@ impl DesktopAppInfo {
                 callback(&appinfo, pid)
             } else {
                 panic!("cannot get closure...")
-            };
+            }
         }
         let pid_callback = if pid_callback_data.is_some() {
             Some(pid_callback_func as _)
diff --git a/gio/src/auto/file.rs b/gio/src/auto/file.rs
@@ -948,7 +948,7 @@ impl<O: IsA<File>> FileExt for O {
                 callback(current_num_bytes, total_num_bytes)
             } else {
                 panic!("cannot get closure...")
-            };
+            }
         }
         let progress_callback = if progress_callback_data.is_some() {
             Some(progress_callback_func as _)
@@ -2036,7 +2036,7 @@ impl<O: IsA<File>> FileExt for O {
                 callback(current_num_bytes, total_num_bytes)
             } else {
                 panic!("cannot get closure...")
-            };
+            }
         }
         let progress_callback = if progress_callback_data.is_some() {
             Some(progress_callback_func as _)
diff --git a/gio/src/auto/subprocess_launcher.rs b/gio/src/auto/subprocess_launcher.rs
@@ -52,7 +52,7 @@ impl SubprocessLauncher {
         let child_setup_data: Box_<P> = Box_::new(child_setup);
         unsafe extern "C" fn child_setup_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {
             let callback: &P = &*(data as *mut _);
-            (*callback)();
+            (*callback)()
         }
         let child_setup = Some(child_setup_func::<P> as _);
         unsafe extern "C" fn destroy_notify_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {
diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/gio/src/auto/vfs.rs b/gio/src/auto/vfs.rs
@@ -123,12 +123,12 @@ impl<O: IsA<Vfs>> VfsExt for O {
             let identifier: Borrowed<glib::GString> = from_glib_borrow(identifier);
             let callback: &Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>> =
                 &*(user_data as *mut _);
-            let res = if let Some(ref callback) = *callback {
+            if let Some(ref callback) = *callback {
                 callback(&vfs, identifier.as_str())
             } else {
                 panic!("cannot get closure...")
-            };
-            res.to_glib_full()
+            }
+            .to_glib_full()
         }
         let uri_func = if uri_func_data.is_some() {
             Some(uri_func_func as _)
@@ -146,12 +146,12 @@ impl<O: IsA<Vfs>> VfsExt for O {
             let identifier: Borrowed<glib::GString> = from_glib_borrow(identifier);
             let callback: &Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>> =
                 &*(user_data as *mut _);
-            let res = if let Some(ref callback) = *callback {
+            if let Some(ref callback) = *callback {
                 callback(&vfs, identifier.as_str())
             } else {
                 panic!("cannot get closure...")
-            };
-            res.to_glib_full()
+            }
+            .to_glib_full()
         }
         let parse_name_func = if parse_name_func_data.is_some() {
             Some(parse_name_func_func as _)
diff --git a/gio/src/cancellable.rs b/gio/src/cancellable.rs
@@ -18,6 +18,7 @@ pub struct CancelledHandlerId(NonZeroU64);
 impl CancelledHandlerId {
     // rustdoc-stripper-ignore-next
     /// Returns the internal signal handler ID.
+    #[allow(clippy::missing_safety_doc)]
     pub unsafe fn as_raw(&self) -> libc::c_ulong {
         self.0.get() as libc::c_ulong
     }
diff --git a/gio/src/dbus_connection.rs b/gio/src/dbus_connection.rs
@@ -238,6 +238,7 @@ impl DBusConnection {
     }
 
     #[doc(alias = "g_dbus_connection_signal_subscribe")]
+    #[allow(clippy::too_many_arguments)]
     pub fn signal_subscribe<
         P: Fn(&DBusConnection, &str, &str, &str, &str, &glib::Variant) + 'static,
     >(
diff --git a/gio/src/lib.rs b/gio/src/lib.rs
@@ -1,12 +1,8 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
-#![allow(unknown_lints)]
 #![allow(clippy::type_complexity)]
 #![allow(clippy::too_many_arguments)]
-#![allow(clippy::missing_safety_doc)]
-#![allow(clippy::upper_case_acronyms)]
-#![allow(clippy::non_send_fields_in_send_ty)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;
@@ -114,7 +110,7 @@ pub mod builders {
 pub use crate::auto::{functions::*, *};
 pub mod prelude;
 
-#[allow(clippy::wrong_self_convention)]
+#[allow(clippy::missing_safety_doc)]
 #[allow(clippy::new_ret_no_self)]
 #[allow(unused_imports)]
 mod auto;
diff --git a/gio/src/settings.rs b/gio/src/settings.rs
@@ -11,7 +11,9 @@ pub struct BindingBuilder<'a> {
     object: &'a glib::Object,
     property: &'a str,
     flags: SettingsBindFlags,
+    #[allow(clippy::type_complexity)]
     get_mapping: Option<Box<dyn Fn(&glib::Variant, glib::Type) -> Option<glib::Value>>>,
+    #[allow(clippy::type_complexity)]
     set_mapping: Option<Box<dyn Fn(&glib::Value, glib::VariantType) -> Option<glib::Variant>>>,
 }
 
diff --git a/gio/src/socket.rs b/gio/src/socket.rs
@@ -21,6 +21,7 @@ use crate::{Cancellable, Socket, SocketAddress, SocketControlMessage};
 
 impl Socket {
     #[cfg(any(unix, feature = "dox"))]
+    #[allow(clippy::missing_safety_doc)]
     pub unsafe fn from_fd(fd: impl IntoRawFd) -> Result<Socket, glib::Error> {
         let fd = fd.into_raw_fd();
         let mut error = ptr::null_mut();
@@ -32,6 +33,7 @@ impl Socket {
         }
     }
     #[cfg(any(windows, feature = "dox"))]
+    #[allow(clippy::missing_safety_doc)]
     pub unsafe fn from_socket(socket: impl IntoRawSocket) -> Result<Socket, glib::Error> {
         let socket = socket.into_raw_socket();
         let mut error = ptr::null_mut();
diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/gir b/gir
@@ -1 +1 @@
-Subproject commit 047f55810b96f41d9956b11244dcbb8a1510c85a
+Subproject commit 425f84d5af7ff4e599b2528bb0e2f53657feb5cf
diff --git a/gir-files b/gir-files
@@ -1 +1 @@
-Subproject commit 5eb11fc699108e254a19675b5a9cd19626367584
+Subproject commit 4eaad6a722bf41028ea9210d2c356b7078b25008
diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/glib/src/lib.rs b/glib/src/lib.rs
@@ -1,10 +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(unknown_lints)]
 #![allow(clippy::missing_safety_doc)]
-#![allow(clippy::wrong_self_convention)]
-#![allow(clippy::non_send_fields_in_send_ty)]
 #![doc = include_str!("../README.md")]
 
 #[doc(hidden)]
@@ -114,10 +111,10 @@ pub use collections::{
 };
 
 pub use self::auto::{functions::*, *};
-#[allow(non_upper_case_globals)]
 #[allow(clippy::too_many_arguments)]
 #[allow(clippy::type_complexity)]
 #[allow(unused_imports)]
+#[allow(non_upper_case_globals)]
 mod auto;
 
 pub use self::gobject::*;
diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/graphene/src/lib.rs b/graphene/src/lib.rs
@@ -16,11 +16,6 @@ macro_rules! skip_assert_initialized {
     () => {};
 }
 
-#[allow(clippy::transmute_ptr_to_ref)]
-#[allow(clippy::type_complexity)]
-#[allow(clippy::unreadable_literal)]
-#[allow(clippy::derive_hash_xor_eq)]
-#[allow(unused_imports)]
 mod auto;
 
 pub mod prelude;
diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/pango/src/attribute.rs b/pango/src/attribute.rs
@@ -67,6 +67,7 @@ impl Attribute {
     }
 }
 
+#[allow(clippy::missing_safety_doc)]
 pub unsafe trait IsAttribute:
     FromGlibPtrFull<*const ffi::PangoAttribute>
     + FromGlibPtrFull<*mut ffi::PangoAttribute>
diff --git a/pango/src/auto/attr_list.rs b/pango/src/auto/attr_list.rs
@@ -41,8 +41,7 @@ impl AttrList {
         ) -> glib::ffi::gboolean {
             let attribute = from_glib_borrow(attribute);
             let callback: *mut P = user_data as *const _ as usize as *mut P;
-            let res = (*callback)(&attribute);
-            res.into_glib()
+            (*callback)(&attribute).into_glib()
         }
         let func = Some(func_func::<P> as _);
         let super_callback0: &P = &func_data;
diff --git a/pango/src/auto/fontset.rs b/pango/src/auto/fontset.rs
@@ -43,8 +43,7 @@ impl<O: IsA<Fontset>> FontsetExt for O {
             let fontset = from_glib_borrow(fontset);
             let font = from_glib_borrow(font);
             let callback: *mut P = user_data as *const _ as usize as *mut P;
-            let res = (*callback)(&fontset, &font);
-            res.into_glib()
+            (*callback)(&fontset, &font).into_glib()
         }
         let func = Some(func_func::<P> as _);
         let super_callback0: &P = &func_data;
diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/pango/src/lib.rs b/pango/src/lib.rs
@@ -2,14 +2,13 @@
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 #![doc = include_str!("../README.md")]
-#![allow(clippy::missing_safety_doc)]
 
 pub use ffi;
 pub use glib;
 
 #[allow(clippy::too_many_arguments)]
 #[allow(clippy::derive_hash_xor_eq)]
-#[allow(unused_imports)]
+#[allow(clippy::missing_safety_doc)]
 mod auto;
 pub use crate::{
     auto::{functions::*, *},
diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
diff --git a/pangocairo/src/lib.rs b/pangocairo/src/lib.rs
@@ -8,8 +8,6 @@ pub use ffi;
 pub use glib;
 pub use pango;
 
-#[allow(clippy::too_many_arguments)]
-#[allow(unused_imports)]
 mod auto;
 
 pub use crate::auto::{functions::*, *};
diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ where`
`12`	`12`	`name: String,`
`13`	`13`	`parameter_type: Option<VariantType>,`
`14`	`14`	`state: Option<Variant>,`
	`15`	`+ #[allow(clippy::type_complexity)]`
`15`	`16`	`pub(crate) activate: Option<Box<dyn Fn(&O, &SimpleAction, Option<&Variant>) + 'static>>,`
	`17`	`+ #[allow(clippy::type_complexity)]`
`16`	`18`	`pub(crate) change_state: Option<Box<dyn Fn(&O, &SimpleAction, Option<&Variant>) + 'static>>,`
`17`	`19`	`}`
`18`	`20`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ impl DesktopAppInfo {`
`237`	`237`	`callback(&appinfo, pid)`
`238`	`238`	`} else {`
`239`	`239`	`panic!("cannot get closure...")`
`240`		`- };`
	`240`	`+ }`
`241`	`241`	`}`
`242`	`242`	`let pid_callback = if pid_callback_data.is_some() {`
`243`	`243`	`Some(pid_callback_func as _)`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ impl SubprocessLauncher {`
`52`	`52`	`let child_setup_data: Box_<P> = Box_::new(child_setup);`
`53`	`53`	`unsafe extern "C" fn child_setup_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {`
`54`	`54`	`let callback: &P = &(data as mut _);`
`55`		`- (*callback)();`
	`55`	`+ (*callback)()`
`56`	`56`	`}`
`57`	`57`	`let child_setup = Some(child_setup_func::<P> as _);`
`58`	`58`	`unsafe extern "C" fn destroy_notify_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {`