Fix clippy warnings

Author: AaronErhardt

gio/src/desktop_app_info.rs

@@ -1,17 +1,17 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-#[cfg(any(all(feature = "v2_58", unix), all(unix, docsrs)))]
+#[cfg(all(unix, feature = "v2_58"))]
 use std::boxed::Box as Box_;
-#[cfg(any(all(feature = "v2_58", unix), all(unix, docsrs)))]
+#[cfg(all(unix, feature = "v2_58"))]
 use std::os::unix::io::AsRawFd;
-#[cfg(any(all(feature = "v2_58", unix), all(unix, docsrs)))]
+#[cfg(all(unix, feature = "v2_58"))]
 use std::ptr;
 
-#[cfg(any(all(feature = "v2_58", unix), all(unix, docsrs)))]
+#[cfg(all(feature = "v2_58", unix))]
 use glib::Error;
 use glib::{prelude::*, translate::*, GString};
 
-#[cfg(any(all(feature = "v2_58", unix), all(unix, docsrs)))]
+#[cfg(all(feature = "v2_58", unix))]
 use crate::AppLaunchContext;
 use crate::DesktopAppInfo;
 
@@ -45,7 +45,7 @@ impl DesktopAppInfo {
 }
 
 pub trait DesktopAppInfoExtManual {
-    #[cfg(any(all(feature = "v2_58", unix), all(unix, docsrs)))]
+    #[cfg(all(feature = "v2_58", unix))]
     #[cfg_attr(docsrs, doc(cfg(all(feature = "v2_58", unix))))]
     #[doc(alias = "g_desktop_app_info_launch_uris_as_manager_with_fds")]
     fn launch_uris_as_manager_with_fds<
@@ -67,7 +67,7 @@ pub trait DesktopAppInfoExtManual {
 }
 
 impl<O: IsA<DesktopAppInfo>> DesktopAppInfoExtManual for O {
-    #[cfg(any(all(feature = "v2_58", unix), all(unix, docsrs)))]
+    #[cfg(all(feature = "v2_58", unix))]
     #[cfg_attr(docsrs, doc(cfg(all(feature = "v2_58", unix))))]
     fn launch_uris_as_manager_with_fds<
         P: IsA<AppLaunchContext>,

gio/src/socket.rs

@@ -2,9 +2,6 @@
 
 #[cfg(not(unix))]
 use std::os::raw::c_int;
-#[cfg(not(windows))]
-#[cfg_attr(docsrs, doc(cfg(not(windows))))]
-use std::os::raw::c_void;
 #[cfg(unix)]
 use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 #[cfg(windows)]
@@ -49,15 +46,15 @@ impl Socket {
     }
 }
 
-#[cfg(unix)]
+#[cfg(any(unix, docsrs))]
 #[cfg_attr(docsrs, doc(cfg(unix)))]
 impl AsRawFd for Socket {
     fn as_raw_fd(&self) -> RawFd {
         unsafe { ffi::g_socket_get_fd(self.to_glib_none().0) as _ }
     }
 }
 
-#[cfg(windows)]
+#[cfg(any(windows, docsrs))]
 #[cfg_attr(docsrs, doc(cfg(windows)))]
 impl AsRawSocket for Socket {
     fn as_raw_socket(&self) -> RawSocket {
@@ -916,7 +913,7 @@ pub trait AsRawSocket {
 }
 
 #[cfg(all(docsrs, not(windows)))]
-pub type RawSocket = *mut c_void;
+pub type RawSocket = *mut std::os::raw::c_void;
 
 #[cfg(test)]
 mod tests {

glib/src/bridged_logging.rs

@@ -142,7 +142,7 @@ impl GlibLogger {
         message: &str,
     ) {
         let line = line.map(|l| l.to_string());
-        let line = line.as_ref().map(|s| s.as_str());
+        let line = line.as_deref();
 
         crate::log_structured!(
             domain.unwrap_or("default"),

glib/src/collections/list.rs

@@ -385,7 +385,8 @@ impl<T: TransparentPtrType> List<T> {
     /// Consumes the list and returns the underlying pointer.
     #[inline]
     pub fn into_raw(mut self) -> *mut ffi::GList {
-        mem::replace(&mut self.ptr, None)
+        self.ptr
+            .take()
             .map(|p| p.as_ptr())
             .unwrap_or(ptr::null_mut())
     }

glib/src/collections/slist.rs

@@ -380,7 +380,8 @@ impl<T: TransparentPtrType> SList<T> {
     /// Consumes the list and returns the underlying pointer.
     #[inline]
     pub fn into_raw(mut self) -> *mut ffi::GSList {
-        mem::replace(&mut self.ptr, None)
+        self.ptr
+            .take()
             .map(|p| p.as_ptr())
             .unwrap_or(ptr::null_mut())
     }

glib/src/main_context_futures.rs

@@ -620,11 +620,10 @@ impl MainContext {
     pub fn block_on<F: Future>(&self, f: F) -> F::Output {
         let mut res = None;
         let l = MainLoop::new(Some(self), false);
-        let l_clone = l.clone();
 
         let f = async {
             res = Some(panic::AssertUnwindSafe(f).catch_unwind().await);
-            l_clone.quit();
+            l.quit();
         };
 
         let f = unsafe {

glib/src/variant.rs

@@ -1958,7 +1958,7 @@ impl<A: AsRef<[T]>, T: FixedSizeVariantType> From<FixedSizeVariantArray<A, T>> f
             let data = Box::new(a.0);
             let (data_ptr, len) = {
                 let data = (*data).as_ref();
-                (data.as_ptr(), data.len() * mem::size_of::<T>())
+                (data.as_ptr(), mem::size_of_val(data))
             };
 
             unsafe extern "C" fn free_data<A: AsRef<[T]>, T: FixedSizeVariantType>(