Merge pull request #1240 from sdroege/0.18-backports

0.18 backports
gtk-rs · Dec 9, 2023 · a44ab02 · a44ab02
2 parents 93f6a02 + eba8f9d
commit a44ab02
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/gio/src/data_input_stream.rs b/gio/src/data_input_stream.rs
@@ -220,7 +220,7 @@ pub trait DataInputStreamExtManual: sealed::Sealed + IsA<DataInputStream> + 'sta
             if error.is_null() {
                 let length = length.assume_init();
                 Ok(FromGlibContainer::from_glib_full_num(
-                    ret as *const _,
+                    ret as *mut u8,
                     length,
                 ))
             } else {
@@ -268,7 +268,7 @@ pub trait DataInputStreamExtManual: sealed::Sealed + IsA<DataInputStream> + 'sta
             let result = if error.is_null() {
                 let length = length.assume_init();
                 Ok(FromGlibContainer::from_glib_full_num(
-                    ret as *const _,
+                    ret as *mut u8,
                     length,
                 ))
             } else {

diff --git a/gio/src/lib.rs b/gio/src/lib.rs
@@ -3,6 +3,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![allow(clippy::type_complexity)]
 #![allow(clippy::too_many_arguments)]
+#![allow(clippy::missing_safety_doc)]
 #![doc = include_str!("../README.md")]
 
 pub use ffi;

diff --git a/gio/src/task.rs b/gio/src/task.rs
@@ -439,9 +439,10 @@ where
     // use Cancellable::NONE as source obj to fulfill `Send` requirement
     let task = unsafe { Task::<bool>::new(Cancellable::NONE, Cancellable::NONE, |_, _| {}) };
     let (join, tx) = JoinHandle::new();
-    task.run_in_thread(move |_, _: Option<&Cancellable>, _| {
+    task.run_in_thread(move |task, _: Option<&Cancellable>, _| {
         let res = panic::catch_unwind(panic::AssertUnwindSafe(func));
         let _ = tx.send(res);
+        unsafe { ffi::g_task_return_pointer(task.to_glib_none().0, ptr::null_mut(), None) }
     });
 
     join

diff --git a/glib/src/boxed_inline.rs b/glib/src/boxed_inline.rs
@@ -50,6 +50,7 @@ macro_rules! glib_boxed_inline_wrapper {
         }
 
         #[allow(clippy::incorrect_clone_impl_on_copy_type)]
+        #[allow(clippy::non_canonical_clone_impl)]
         impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? std::clone::Clone for $name $(<$($generic),+>)? {
             #[inline]
             fn clone(&self) -> Self {

diff --git a/glib/src/lib.rs b/glib/src/lib.rs
@@ -2,6 +2,7 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![allow(clippy::missing_safety_doc)]
+#![allow(renamed_and_removed_lints)]
 #![doc = include_str!("../README.md")]
 
 pub use bitflags;