gtk-rs · bilelmoussaoui · Nov 12, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 5, 2024
diff --git a/Cargo.lock b/Cargo.lock
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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
@@ -229,7 +229,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + '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,
@@ -247,7 +247,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + '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(
@@ -256,7 +256,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + '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());
@@ -1257,7 +1257,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + '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,
@@ -1275,7 +1275,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + '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(
@@ -1284,7 +1284,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + '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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
diff --git a/gir b/gir
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
diff --git a/glib/src/source.rs b/glib/src/source.rs
@@ -53,7 +53,7 @@ impl FromGlib<u32> for SourceId {
 }
 
 // rustdoc-stripper-ignore-next
-/// Process identificator
+/// Process identifier
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 #[doc(alias = "GPid")]
 pub struct Pid(pub ffi::GPid);
@@ -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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
diff --git a/pango/Gir.toml b/pango/Gir.toml
@@ -383,6 +383,9 @@ status = "generate"
     [[object.function]]
     name = "x_to_index"
     manual = true
+    [[object.function]]
+    name = "get_x_ranges"
+    manual = true
 
 [[object]]
 name = "Pango.Matrix"

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
@@ -26,7 +26,7 @@ mod sealed {
 pub trait FontsetExt: IsA<Fontset> + sealed::Sealed + '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,
@@ -38,12 +38,12 @@ pub trait FontsetExt: IsA<Fontset> + sealed::Sealed + '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/layout_line.rs b/pango/src/auto/layout_line.rs
@@ -90,23 +90,6 @@ impl LayoutLine {
         unsafe { ffi::pango_layout_line_get_start_index(self.to_glib_none().0) }
     }
 
-    #[doc(alias = "pango_layout_line_get_x_ranges")]
-    #[doc(alias = "get_x_ranges")]
-    pub fn x_ranges(&self, start_index: i32, end_index: i32) -> Vec<i32> {
-        unsafe {
-            let mut ranges = std::ptr::null_mut();
-            let mut n_ranges = std::mem::MaybeUninit::uninit();
-            ffi::pango_layout_line_get_x_ranges(
-                self.to_glib_none().0,
-                start_index,
-                end_index,
-                &mut ranges,
-                n_ranges.as_mut_ptr(),
-            );
-            FromGlibContainer::from_glib_full_num(ranges, n_ranges.assume_init() as _)
-        }
-    }
-
     #[doc(alias = "pango_layout_line_index_to_x")]
     pub fn index_to_x(&self, index_: i32, trailing: bool) -> i32 {
         unsafe {

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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
diff --git a/pango/src/layout.rs b/pango/src/layout.rs
@@ -90,4 +90,21 @@ impl LayoutLine {
             is_inside,
         }
     }
+
+    #[doc(alias = "pango_layout_line_get_x_ranges")]
+    #[doc(alias = "get_x_ranges")]
+    pub fn x_ranges(&self, start_index: i32, end_index: i32) -> Vec<i32> {
+        unsafe {
+            let mut ranges = std::ptr::null_mut();
+            let mut n_ranges = std::mem::MaybeUninit::uninit();
+            ffi::pango_layout_line_get_x_ranges(
+                self.to_glib_none().0,
+                start_index,
+                end_index,
+                &mut ranges,
+                n_ranges.as_mut_ptr(),
+            );
+            FromGlibContainer::from_glib_full_num(ranges, 2 * n_ranges.assume_init() as usize)
+        }
+    }
 }
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
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 @ c954dbdc9ac0)
+Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
 from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
+6 −6		Cargo.lock
+2 −2		src/analysis/bounds.rs
+8 −0		src/analysis/rust_type.rs
+1 −1		src/analysis/types.rs
+10 −6		src/codegen/function_body_chunk.rs
+1 −1		src/config/parameter_matchable.rs
+2 −2		src/library.rs
+1 −1		src/xmlparser.rs