Merge pull request #1566 from fengalin/fix-callback-userdata-mutability

sdroege · web-flow · commit 6da7aba8b483 · 2024-11-07T10:50:02.000+02:00
Fix callback userdata mutability
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
diff --git a/gio/src/auto/desktop_app_info.rs b/gio/src/auto/desktop_app_info.rs
@@ -218,7 +218,8 @@ impl DesktopAppInfo {
         } else {
             None
         };
-        let pid_callback_data: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> = pid_callback;
+        let mut pid_callback_data: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
+            pid_callback;
         unsafe extern "C" fn pid_callback_func(
             appinfo: *mut ffi::GDesktopAppInfo,
             pid: glib::ffi::GPid,
@@ -239,8 +240,8 @@ impl DesktopAppInfo {
             None
         };
         let super_callback0: Box_<Option<Box_<dyn FnOnce() + 'static>>> = user_setup_data;
-        let super_callback1: &Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
-            &pid_callback_data;
+        let super_callback1: &mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
+            &mut pid_callback_data;
         unsafe {
             let mut error = std::ptr::null_mut();
             let is_ok = ffi::g_desktop_app_info_launch_uris_as_manager(
@@ -251,7 +252,7 @@ impl DesktopAppInfo {
                 user_setup,
                 Box_::into_raw(super_callback0) as *mut _,
                 pid_callback,
-                super_callback1 as *const _ as *mut _,
+                super_callback1 as *mut _ as *mut _,
                 &mut error,
             );
             debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
diff --git a/gio/src/auto/file.rs b/gio/src/auto/file.rs
@@ -224,7 +224,7 @@ pub trait FileExt: IsA<File> + 'static {
         cancellable: Option<&impl IsA<Cancellable>>,
         progress_callback: Option<&mut dyn (FnMut(i64, i64))>,
     ) -> Result<(), glib::Error> {
-        let progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
+        let mut progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
         unsafe extern "C" fn progress_callback_func(
             current_num_bytes: i64,
             total_num_bytes: i64,
@@ -242,7 +242,7 @@ pub trait FileExt: IsA<File> + 'static {
         } else {
             None
         };
-        let super_callback0: &Option<&mut dyn (FnMut(i64, i64))> = &progress_callback_data;
+        let super_callback0: &mut Option<&mut dyn (FnMut(i64, i64))> = &mut progress_callback_data;
         unsafe {
             let mut error = std::ptr::null_mut();
             let is_ok = ffi::g_file_copy(
@@ -251,7 +251,7 @@ pub trait FileExt: IsA<File> + 'static {
                 flags.into_glib(),
                 cancellable.map(|p| p.as_ref()).to_glib_none().0,
                 progress_callback,
-                super_callback0 as *const _ as *mut _,
+                super_callback0 as *mut _ as *mut _,
                 &mut error,
             );
             debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
@@ -1252,7 +1252,7 @@ pub trait FileExt: IsA<File> + 'static {
         cancellable: Option<&impl IsA<Cancellable>>,
         progress_callback: Option<&mut dyn (FnMut(i64, i64))>,
     ) -> Result<(), glib::Error> {
-        let progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
+        let mut progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
         unsafe extern "C" fn progress_callback_func(
             current_num_bytes: i64,
             total_num_bytes: i64,
@@ -1270,7 +1270,7 @@ pub trait FileExt: IsA<File> + 'static {
         } else {
             None
         };
-        let super_callback0: &Option<&mut dyn (FnMut(i64, i64))> = &progress_callback_data;
+        let super_callback0: &mut Option<&mut dyn (FnMut(i64, i64))> = &mut progress_callback_data;
         unsafe {
             let mut error = std::ptr::null_mut();
             let is_ok = ffi::g_file_move(
@@ -1279,7 +1279,7 @@ pub trait FileExt: IsA<File> + 'static {
                 flags.into_glib(),
                 cancellable.map(|p| p.as_ref()).to_glib_none().0,
                 progress_callback,
-                super_callback0 as *const _ as *mut _,
+                super_callback0 as *mut _ as *mut _,
                 &mut error,
             );
             debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
diff --git a/gir b/gir
@@ -1 +1 @@
-Subproject commit a172dda2a7283d286d45c237b0f8bc39b5354e94
+Subproject commit e5ad53c3ad05f06c499704f2d39d2a04c4111eb4
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
diff --git a/glib/src/source.rs b/glib/src/source.rs
@@ -1092,9 +1092,9 @@ where
         ffi::g_source_set_callback(
             source,
             Some(transmute::<
-                *const (),
+                *mut (),
                 unsafe extern "C" fn(ffi::gpointer) -> ffi::gboolean,
-            >(trampoline_child_watch::<F> as *const ())),
+            >(trampoline_child_watch::<F> as *mut ())),
             into_raw_child_watch(func),
             Some(destroy_closure_child_watch::<F>),
         );
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
diff --git a/pango/src/auto/attr_list.rs b/pango/src/auto/attr_list.rs
@@ -31,7 +31,7 @@ impl AttrList {
     #[doc(alias = "pango_attr_list_filter")]
     #[must_use]
     pub fn filter<P: FnMut(&Attribute) -> bool>(&self, func: P) -> Option<AttrList> {
-        let func_data: P = func;
+        let mut func_data: P = func;
         unsafe extern "C" fn func_func<P: FnMut(&Attribute) -> bool>(
             attribute: *mut ffi::PangoAttribute,
             user_data: glib::ffi::gpointer,
@@ -41,12 +41,12 @@ impl AttrList {
             (*callback)(&attribute).into_glib()
         }
         let func = Some(func_func::<P> as _);
-        let super_callback0: &P = &func_data;
+        let super_callback0: &mut P = &mut func_data;
         unsafe {
             from_glib_full(ffi::pango_attr_list_filter(
                 self.to_glib_none().0,
                 func,
-                super_callback0 as *const _ as *mut _,
+                super_callback0 as *mut _ as *mut _,
             ))
         }
     }
diff --git a/pango/src/auto/fontset.rs b/pango/src/auto/fontset.rs
@@ -21,7 +21,7 @@ impl Fontset {
 pub trait FontsetExt: IsA<Fontset> + 'static {
     #[doc(alias = "pango_fontset_foreach")]
     fn foreach<P: FnMut(&Fontset, &Font) -> bool>(&self, func: P) {
-        let func_data: P = func;
+        let mut func_data: P = func;
         unsafe extern "C" fn func_func<P: FnMut(&Fontset, &Font) -> bool>(
             fontset: *mut ffi::PangoFontset,
             font: *mut ffi::PangoFont,
@@ -33,12 +33,12 @@ pub trait FontsetExt: IsA<Fontset> + 'static {
             (*callback)(&fontset, &font).into_glib()
         }
         let func = Some(func_func::<P> as _);
-        let super_callback0: &P = &func_data;
+        let super_callback0: &mut P = &mut func_data;
         unsafe {
             ffi::pango_fontset_foreach(
                 self.as_ref().to_glib_none().0,
                 func,
-                super_callback0 as *const _ as *mut _,
+                super_callback0 as *mut _ as *mut _,
             );
         }
     }
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
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 @ a172dda2a728)
+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)
 from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Generated by gir (https://github.com/gtk-rs/gir @ a172dda2a728)`
	`1`	`+Generated by gir (https://github.com/gtk-rs/gir @ e5ad53c3ad05)`
`2`	`2`	`from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)`