Merge pull request #1421 from gtk-rs/bilelmoussaoui/clippy-warnings

sdroege · web-flow · commit 147b477f2b49 · 2024-05-31T14:05:58.000+03:00
Fix various nightly clippy warnings
diff --git a/gio/src/application.rs b/gio/src/application.rs
@@ -53,7 +53,7 @@ pub trait ApplicationExtManual: sealed::Sealed + IsA<Application> {
             connect_raw(
                 self.as_ptr() as *mut _,
                 b"open\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
+                Some(transmute::<*const (), unsafe extern "C" fn()>(
                     open_trampoline::<Self, F> as *const (),
                 )),
                 Box_::into_raw(f),
diff --git a/gio/src/cancellable.rs b/gio/src/cancellable.rs
@@ -80,7 +80,7 @@ pub trait CancellableExtManual: sealed::Sealed + IsA<Cancellable> {
         unsafe {
             from_glib(ffi::g_cancellable_connect(
                 self.as_ptr() as *mut _,
-                Some(std::mem::transmute::<_, unsafe extern "C" fn()>(
+                Some(std::mem::transmute::<*const (), unsafe extern "C" fn()>(
                     connect_trampoline::<Self, F> as *const (),
                 )),
                 Box::into_raw(callback) as *mut _,
diff --git a/gio/src/datagram_based.rs b/gio/src/datagram_based.rs
@@ -57,7 +57,7 @@ pub trait DatagramBasedExtManual: sealed::Sealed + IsA<DatagramBased> + Sized {
             glib::ffi::g_source_set_callback(
                 source,
                 Some(transmute::<
-                    _,
+                    glib::ffi::gpointer,
                     unsafe extern "C" fn(glib::ffi::gpointer) -> glib::ffi::gboolean,
                 >(trampoline)),
                 Box::into_raw(Box::new(RefCell::new(func))) as glib::ffi::gpointer,
diff --git a/gio/src/dbus_proxy.rs b/gio/src/dbus_proxy.rs
@@ -50,7 +50,7 @@ pub trait DBusProxyExtManual: sealed::Sealed + IsA<DBusProxy> + 'static {
             connect_raw(
                 self.as_ptr() as *mut _,
                 signal_name.as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
+                Some(transmute::<*const (), unsafe extern "C" fn()>(
                     g_signal_trampoline::<Self, F> as *const (),
                 )),
                 Box_::into_raw(f),
@@ -91,7 +91,7 @@ pub trait DBusProxyExtManual: sealed::Sealed + IsA<DBusProxy> + 'static {
             connect_raw(
                 self.as_ptr() as *mut _,
                 b"g-signal\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
+                Some(transmute::<*const (), unsafe extern "C" fn()>(
                     g_signal_trampoline::<Self, F> as *const (),
                 )),
                 Box_::into_raw(f),
diff --git a/gio/src/pollable_input_stream.rs b/gio/src/pollable_input_stream.rs
@@ -55,7 +55,7 @@ pub trait PollableInputStreamExtManual: sealed::Sealed + IsA<PollableInputStream
             glib::ffi::g_source_set_callback(
                 source,
                 Some(transmute::<
-                    _,
+                    glib::ffi::gpointer,
                     unsafe extern "C" fn(glib::ffi::gpointer) -> glib::ffi::gboolean,
                 >(trampoline)),
                 Box::into_raw(Box::new(RefCell::new(func))) as glib::ffi::gpointer,
diff --git a/gio/src/pollable_output_stream.rs b/gio/src/pollable_output_stream.rs
@@ -59,7 +59,7 @@ pub trait PollableOutputStreamExtManual: sealed::Sealed + IsA<PollableOutputStre
             glib::ffi::g_source_set_callback(
                 source,
                 Some(transmute::<
-                    _,
+                    glib::ffi::gpointer,
                     unsafe extern "C" fn(glib::ffi::gpointer) -> glib::ffi::gboolean,
                 >(trampoline)),
                 Box::into_raw(Box::new(RefCell::new(func))) as glib::ffi::gpointer,
diff --git a/gio/src/socket.rs b/gio/src/socket.rs
@@ -695,7 +695,7 @@ pub trait SocketExtManual: sealed::Sealed + IsA<Socket> + Sized {
             glib::ffi::g_source_set_callback(
                 source,
                 Some(transmute::<
-                    _,
+                    glib::ffi::gpointer,
                     unsafe extern "C" fn(glib::ffi::gpointer) -> glib::ffi::gboolean,
                 >(trampoline)),
                 Box::into_raw(Box::new(RefCell::new(func))) as glib::ffi::gpointer,
diff --git a/gio/src/subclass/input_stream.rs b/gio/src/subclass/input_stream.rs
@@ -123,8 +123,6 @@ unsafe extern "C" fn stream_read<T: InputStreamImpl>(
     cancellable: *mut ffi::GCancellable,
     err: *mut *mut glib::ffi::GError,
 ) -> isize {
-    use std::{isize, slice};
-
     debug_assert!(count <= isize::MAX as usize);
 
     let instance = &*(ptr as *mut T::Instance);
@@ -134,7 +132,7 @@ unsafe extern "C" fn stream_read<T: InputStreamImpl>(
         if count == 0 {
             &mut []
         } else {
-            slice::from_raw_parts_mut(buffer as *mut u8, count)
+            std::slice::from_raw_parts_mut(buffer as *mut u8, count)
         },
         Option::<Cancellable>::from_glib_borrow(cancellable)
             .as_ref()
@@ -183,8 +181,6 @@ unsafe extern "C" fn stream_skip<T: InputStreamImpl>(
     cancellable: *mut ffi::GCancellable,
     err: *mut *mut glib::ffi::GError,
 ) -> isize {
-    use std::isize;
-
     debug_assert!(count <= isize::MAX as usize);
 
     let instance = &*(ptr as *mut T::Instance);
diff --git a/gio/src/subclass/output_stream.rs b/gio/src/subclass/output_stream.rs
@@ -171,8 +171,6 @@ unsafe extern "C" fn stream_write<T: OutputStreamImpl>(
     cancellable: *mut ffi::GCancellable,
     err: *mut *mut glib::ffi::GError,
 ) -> isize {
-    use std::{isize, slice};
-
     debug_assert!(count <= isize::MAX as usize);
 
     let instance = &*(ptr as *mut T::Instance);
@@ -182,7 +180,7 @@ unsafe extern "C" fn stream_write<T: OutputStreamImpl>(
         if count == 0 {
             &[]
         } else {
-            slice::from_raw_parts(buffer as *const u8, count)
+            std::slice::from_raw_parts(buffer as *const u8, count)
         },
         Option::<Cancellable>::from_glib_borrow(cancellable)
             .as_ref()
@@ -266,7 +264,6 @@ unsafe extern "C" fn stream_splice<T: OutputStreamImpl>(
             .as_ref(),
     ) {
         Ok(res) => {
-            use std::isize;
             assert!(res <= isize::MAX as usize);
             res as isize
         }
diff --git a/gio/src/subclass/socket_control_message.rs b/gio/src/subclass/socket_control_message.rs
@@ -202,11 +202,11 @@ mod tests {
 
         impl SocketControlMessageImpl for TestSocketControlMessage {
             fn level(&self) -> i32 {
-                std::i32::MAX
+                i32::MAX
             }
 
             fn msg_type(&self) -> i32 {
-                std::i32::MAX
+                i32::MAX
             }
 
             fn size(&self) -> usize {
@@ -218,7 +218,7 @@ mod tests {
             }
 
             fn deserialize(level: i32, type_: i32, data: &[u8]) -> Option<SocketControlMessage> {
-                if level == std::i32::MAX && type_ == std::i32::MAX {
+                if level == i32::MAX && type_ == i32::MAX {
                     let obj = glib::Object::new::<super::TestSocketControlMessage>();
                     obj.imp().0.set(u64::from_ne_bytes(data.try_into().ok()?));
                     Some(obj.into())
@@ -238,16 +238,16 @@ mod tests {
     fn test_socket_control_message_subclassing() {
         let obj = glib::Object::new::<TestSocketControlMessage>();
 
-        assert_eq!(obj.level(), std::i32::MAX);
-        assert_eq!(obj.msg_type(), std::i32::MAX);
+        assert_eq!(obj.level(), i32::MAX);
+        assert_eq!(obj.msg_type(), i32::MAX);
         assert_eq!(obj.size(), size_of::<u64>());
 
         obj.imp().0.set(0x12345678abcdefu64);
 
         let mut data = [0; size_of::<u64>()];
         obj.serialize(&mut data);
 
-        let de = SocketControlMessage::deserialize(std::i32::MAX, std::i32::MAX, &data)
+        let de = SocketControlMessage::deserialize(i32::MAX, i32::MAX, &data)
             .expect("deserialize failed");
         let de = de
             .downcast::<TestSocketControlMessage>()
diff --git a/gio/src/task.rs b/gio/src/task.rs
@@ -220,7 +220,7 @@ macro_rules! task_impl {
                     connect_raw(
                         self.as_ptr() as *mut _,
                         b"notify::completed\0".as_ptr() as *const _,
-                        Some(transmute::<_, unsafe extern "C" fn()>(
+                        Some(transmute::<*const (), unsafe extern "C" fn()>(
                             notify_completed_trampoline::<V, F> as *const (),
                         )),
                         Box_::into_raw(f),
diff --git a/gio/tests/std_io_copy.rs b/gio/tests/std_io_copy.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "v2_36")]
-
 use std::io;
 
 use gio::prelude::*;
diff --git a/glib-macros/tests/value_delegate_derive.rs b/glib-macros/tests/value_delegate_derive.rs
@@ -31,10 +31,10 @@ fn into_value() {
         }
     }
 
-    test_func(&Test(123));
+    test_func(Test(123));
     test_func(Test(123));
 
-    test_func(&TestManualFrom(123));
+    test_func(TestManualFrom(123));
     test_func(TestManualFrom(123));
 
     test_func(TestNullable("foo".to_string()));
diff --git a/glib/src/gobject/signal_group.rs b/glib/src/gobject/signal_group.rs
@@ -104,7 +104,7 @@ impl SignalGroup {
         connect_raw(
             self.as_ptr() as *mut _,
             b"bind\0".as_ptr() as *const _,
-            Some(transmute::<_, unsafe extern "C" fn()>(
+            Some(transmute::<*const (), unsafe extern "C" fn()>(
                 bind_trampoline::<F> as *const (),
             )),
             Box::into_raw(f),
@@ -123,7 +123,7 @@ impl SignalGroup {
         connect_raw(
             self.as_ptr() as *mut _,
             b"unbind\0".as_ptr() as *const _,
-            Some(transmute::<_, unsafe extern "C" fn()>(
+            Some(transmute::<*const (), unsafe extern "C" fn()>(
                 unbind_trampoline::<F> as *const (),
             )),
             Box::into_raw(f),
diff --git a/glib/src/gstring.rs b/glib/src/gstring.rs
@@ -33,7 +33,7 @@ impl GStr {
     pub fn from_utf8_with_nul(bytes: &[u8]) -> Result<&Self, GStrError> {
         Self::check_trailing_nul(bytes)?;
         std::str::from_utf8(bytes)?;
-        Ok(unsafe { mem::transmute(bytes) })
+        Ok(unsafe { mem::transmute::<&[u8], &GStr>(bytes) })
     }
     // rustdoc-stripper-ignore-next
     /// Creates a GLib string wrapper from a byte slice, checking for interior nul-bytes.
@@ -44,7 +44,7 @@ impl GStr {
     pub fn from_utf8_with_nul_checked(bytes: &[u8]) -> Result<&Self, GStrError> {
         Self::check_nuls(bytes)?;
         std::str::from_utf8(bytes)?;
-        Ok(unsafe { mem::transmute(bytes) })
+        Ok(unsafe { mem::transmute::<&[u8], &GStr>(bytes) })
     }
     // rustdoc-stripper-ignore-next
     /// Unsafely creates a GLib string wrapper from a byte slice.
@@ -60,7 +60,7 @@ impl GStr {
     pub const unsafe fn from_utf8_with_nul_unchecked(bytes: &[u8]) -> &Self {
         debug_assert!(!bytes.is_empty() && bytes[bytes.len() - 1] == 0);
         debug_assert!(std::str::from_utf8(bytes).is_ok());
-        mem::transmute(bytes)
+        mem::transmute::<&[u8], &GStr>(bytes)
     }
     // rustdoc-stripper-ignore-next
     /// Creates a GLib string wrapper from a byte slice, truncating it at the first nul-byte.
@@ -72,7 +72,7 @@ impl GStr {
         let nul_pos = memchr::memchr(0, bytes).ok_or(GStrError::NoTrailingNul)?;
         let bytes = unsafe { bytes.get_unchecked(..nul_pos + 1) };
         std::str::from_utf8(bytes)?;
-        Ok(unsafe { mem::transmute(bytes) })
+        Ok(unsafe { mem::transmute::<&[u8], &GStr>(bytes) })
     }
     // rustdoc-stripper-ignore-next
     /// Creates a GLib string wrapper from a string slice.
@@ -84,7 +84,7 @@ impl GStr {
     #[inline]
     pub fn from_str_with_nul(s: &str) -> Result<&Self, GStrError> {
         Self::check_trailing_nul(s)?;
-        Ok(unsafe { mem::transmute(s) })
+        Ok(unsafe { mem::transmute::<&str, &GStr>(s) })
     }
     // rustdoc-stripper-ignore-next
     /// Creates a GLib string wrapper from a string slice, checking for interior nul-bytes.
@@ -96,7 +96,7 @@ impl GStr {
     #[inline]
     pub fn from_str_with_nul_checked(s: &str) -> Result<&Self, GStrError> {
         Self::check_nuls(s)?;
-        Ok(unsafe { mem::transmute(s) })
+        Ok(unsafe { mem::transmute::<&str, &GStr>(s) })
     }
     // rustdoc-stripper-ignore-next
     /// Unsafely creates a GLib string wrapper from a string slice. The string slice must be
@@ -112,7 +112,7 @@ impl GStr {
     #[inline]
     pub const unsafe fn from_str_with_nul_unchecked(s: &str) -> &Self {
         debug_assert!(!s.is_empty() && s.as_bytes()[s.len() - 1] == 0);
-        mem::transmute(s)
+        mem::transmute::<&str, &GStr>(s)
     }
     // rustdoc-stripper-ignore-next
     /// Creates a GLib string wrapper from a string slice, truncating it at the first nul-byte.
@@ -126,7 +126,7 @@ impl GStr {
         let b = s.as_bytes();
         let nul_pos = memchr::memchr(0, b).ok_or(GStrError::NoTrailingNul)?;
         let s = unsafe { std::str::from_utf8_unchecked(b.get_unchecked(..nul_pos + 1)) };
-        Ok(unsafe { mem::transmute(s) })
+        Ok(unsafe { mem::transmute::<&str, &GStr>(s) })
     }
     // rustdoc-stripper-ignore-next
     /// Wraps a raw C string with a safe GLib string wrapper. The provided C string **must** be
diff --git a/glib/src/object.rs b/glib/src/object.rs
@@ -3008,7 +3008,7 @@ impl<T: ObjectType> ObjectExt for T {
         crate::signal::connect_raw(
             self.as_object_ref().to_glib_none().0,
             signal_name.as_ptr() as *const _,
-            Some(mem::transmute::<_, unsafe extern "C" fn()>(
+            Some(mem::transmute::<*const (), unsafe extern "C" fn()>(
                 notify_trampoline::<Self, F> as *const (),
             )),
             Box::into_raw(f),
diff --git a/glib/src/source.rs b/glib/src/source.rs
@@ -1092,7 +1092,7 @@ where
         ffi::g_source_set_callback(
             source,
             Some(transmute::<
-                _,
+                *const (),
                 unsafe extern "C" fn(ffi::gpointer) -> ffi::gboolean,
             >(trampoline_child_watch::<F> as *const ())),
             into_raw_child_watch(func),
@@ -1168,7 +1168,7 @@ where
         ffi::g_source_set_callback(
             source,
             Some(transmute::<
-                _,
+                *const (),
                 unsafe extern "C" fn(ffi::gpointer) -> ffi::gboolean,
             >(trampoline_unix_fd::<F> as *const ())),
             into_raw_unix_fd(func),
diff --git a/glib/src/value_array.rs b/glib/src/value_array.rs
@@ -23,7 +23,7 @@ impl ValueArray {
         let iter = values.into_iter();
         let mut array = Self::with_capacity(iter.size_hint().0);
         for v in iter {
-            array.append(&v.to_value());
+            array.append(v.to_value());
         }
 
         array
diff --git a/glib/src/variant.rs b/glib/src/variant.rs
@@ -2197,7 +2197,7 @@ mod tests {
         ($name:ident, $ty:ident) => {
             #[test]
             fn $name() {
-                let mut n = $ty::max_value();
+                let mut n = $ty::MAX;
                 while n > 0 {
                     let v = n.to_variant();
                     assert_eq!(v.get(), Some(n));
@@ -2211,7 +2211,7 @@ mod tests {
         ($name:ident, $ty:ident) => {
             #[test]
             fn $name() {
-                let mut n = $ty::max_value();
+                let mut n = $ty::MAX;
                 while n > 0 {
                     let v = n.to_variant();
                     assert_eq!(v.get(), Some(n));
