Merge pull request #1085 from sdroege/clippy-1.69

Fix various new Rust 1.69 clippy warnings

Author: sdroege

gio/src/desktop_app_info.rs

@@ -86,21 +86,19 @@ impl<O: IsA<DesktopAppInfo>> DesktopAppInfoExtManual for O {
         stderr_fd: &mut V,
     ) -> Result<(), Error> {
         let user_setup_data: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::new(user_setup);
-        unsafe extern "C" fn user_setup_func<P: IsA<AppLaunchContext>>(
-            user_data: glib::ffi::gpointer,
-        ) {
+        unsafe extern "C" fn user_setup_func(user_data: glib::ffi::gpointer) {
             let callback: Box_<Option<Box_<dyn FnOnce() + 'static>>> =
                 Box_::from_raw(user_data as *mut _);
             let callback = (*callback).expect("cannot get closure...");
             callback()
         }
         let user_setup = if user_setup_data.is_some() {
-            Some(user_setup_func::<P> as _)
+            Some(user_setup_func as _)
         } else {
             None
         };
         let pid_callback_data: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> = pid_callback;
-        unsafe extern "C" fn pid_callback_func<P: IsA<AppLaunchContext>>(
+        unsafe extern "C" fn pid_callback_func(
             appinfo: *mut ffi::GDesktopAppInfo,
             pid: glib::ffi::GPid,
             user_data: glib::ffi::gpointer,
@@ -117,7 +115,7 @@ impl<O: IsA<DesktopAppInfo>> DesktopAppInfoExtManual for O {
             };
         }
         let pid_callback = if pid_callback_data.is_some() {
-            Some(pid_callback_func::<P> as _)
+            Some(pid_callback_func as _)
         } else {
             None
         };

glib-macros/tests/properties.rs

@@ -388,8 +388,8 @@ fn props() {
 #[cfg(test)]
 mod kw_names {
     mod imp {
-        use glib::subclass::types::ObjectSubclassExt;
-        use glib::subclass::{object::DerivedObjectProperties, prelude::ObjectImplExt};
+
+        use glib::subclass::object::DerivedObjectProperties;
         use glib::ObjectExt;
         use std::cell::Cell;
 

glib-macros/tests/value_delegate_derive.rs

@@ -37,10 +37,10 @@ fn into_value() {
     test_func(&TestManualFrom(123));
     test_func(TestManualFrom(123));
 
-    test_func(&TestNullable("foo".to_string()));
+    test_func(TestNullable("foo".to_string()));
     test_func(TestNullable("foo".to_string()));
     test_func(Some(&TestNullable("foo".to_string())));
-    test_func(&Some(TestNullable("foo".to_string())));
+    test_func(Some(TestNullable("foo".to_string())));
     test_func(Some(TestNullable("foo".to_string())));
 
     assert_eq!(glib::Value::from(Test(123)).get::<Test>().unwrap().0, 123);
@@ -149,7 +149,7 @@ fn higher_level_types() {
     }
     impl<'a> From<&'a MyVecManualFrom> for Option<String> {
         fn from(v: &'a MyVecManualFrom) -> Self {
-            v.0.iter().next().cloned()
+            v.0.first().cloned()
         }
     }
     impl From<MyVecManualFrom> for Option<String> {
@@ -160,7 +160,7 @@ fn higher_level_types() {
 
     let vec = vec!["foo".to_string(), "bar".to_string()];
     let vec_value = vec.to_value();
-    let my_vec_value = MyVec(vec.clone()).to_value();
+    let my_vec_value = MyVec(vec).to_value();
     assert_eq!(MyVec::static_type(), Vec::<String>::static_type());
     assert_eq!(
         vec_value.get::<Vec<String>>().unwrap(),

glib/src/subclass/object.rs

@@ -567,7 +567,7 @@ mod test {
         );
 
         assert_eq!(obj.property::<String>("name"), String::from("initial"));
-        obj.set_property("name", &"test");
+        obj.set_property("name", "test");
         assert_eq!(obj.property::<String>("name"), String::from("test"));
 
         let child = Object::with_type(ChildObject::static_type());
@@ -582,7 +582,7 @@ mod test {
             .property("name", "initial")
             .build();
 
-        obj.set_property("construct-name", &"test");
+        obj.set_property("construct-name", "test");
     }
 
     #[test]
@@ -593,7 +593,7 @@ mod test {
             .property("name", "initial")
             .build();
 
-        obj.set_property("test", &true);
+        obj.set_property("test", true);
     }
 
     #[test]
@@ -604,7 +604,7 @@ mod test {
             .property("name", "initial")
             .build();
 
-        obj.set_property("constructed", &false);
+        obj.set_property("constructed", false);
     }
 
     #[test]
@@ -615,7 +615,7 @@ mod test {
             .property("name", "initial")
             .build();
 
-        obj.set_property("name", &false);
+        obj.set_property("name", false);
     }
 
     #[test]

glib/tests/subclass_compiletest/02-no-auto-send-sync.stderr

@@ -7,6 +7,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
    |     required by a bound introduced by this call
    |
    = help: within `imp::TestObject`, the trait `Sync` is not implemented for `RefCell<std::string::String>`
+   = note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead
 note: required because it appears within the type `TestObject`
   --> tests/subclass_compiletest/02-no-auto-send-sync.rs:6:16
    |

glib/tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.stderr

@@ -7,6 +7,7 @@ error[E0277]: `RefCell<std::string::String>` cannot be shared between threads sa
    |     required by a bound introduced by this call
    |
    = help: within `imp_parent::TestParent`, the trait `Sync` is not implemented for `RefCell<std::string::String>`
+   = note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead
 note: required because it appears within the type `TestParent`
   --> tests/subclass_compiletest/05-no-auto-send-sync-with-non-send-sync-parent.rs:6:16
    |