0.21 backports

cairo/src/stream.rs

@@ -200,7 +200,7 @@ struct MutableCallbackEnvironment {
 // so code outside of the `catch_unwind` call must never panic.
 extern "C" fn write_callback<W: io::Write + 'static>(
     env: *mut c_void,
-    data: *mut c_uchar,
+    data: *const c_uchar,
     length: c_uint,
 ) -> ffi::cairo_status_t {
     // This is consistent with the type of `env` in `Surface::_for_stream`.

cairo/src/surface_png.rs

@@ -57,7 +57,7 @@ struct WriteEnv<'a, W: 'a + Write> {
 
 unsafe extern "C" fn write_func<W: Write>(
     closure: *mut c_void,
-    data: *mut u8,
+    data: *const u8,
     len: c_uint,
 ) -> crate::ffi::cairo_status_t {
     let write_env: &mut WriteEnv<W> = &mut *(closure as *mut WriteEnv<W>);

cairo/sys/src/lib.rs

@@ -262,7 +262,7 @@ pub type cairo_destroy_func_t = Option<unsafe extern "C" fn(*mut c_void)>;
 pub type cairo_read_func_t =
     Option<unsafe extern "C" fn(*mut c_void, *mut c_uchar, c_uint) -> cairo_status_t>;
 pub type cairo_write_func_t =
-    Option<unsafe extern "C" fn(*mut c_void, *mut c_uchar, c_uint) -> cairo_status_t>;
+    Option<unsafe extern "C" fn(*mut c_void, *const c_uchar, c_uint) -> cairo_status_t>;
 
 #[cfg(feature = "freetype")]
 #[cfg_attr(docsrs, doc(cfg(feature = "freetype")))]
@@ -1523,7 +1523,7 @@ extern "C" {
     pub fn cairo_script_create_for_stream(
         write_func: cairo_write_func_t,
         closure: *mut c_void,
-    ) -> cairo_status_t;
+    ) -> *mut cairo_device_t;
     #[cfg(feature = "script")]
     #[cfg_attr(docsrs, doc(cfg(feature = "script")))]
     pub fn cairo_script_from_recording_surface(

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 19ccbbc9a3d1)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)
+from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 19ccbbc9a3d1)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)
+from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)

gio/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 19ccbbc9a3d1)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)
+from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)

gio/src/file_descriptor_based.rs

@@ -1,12 +1,12 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #[cfg(unix)]
-use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
+use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, RawFd};
 
 use crate::ffi;
 use glib::{prelude::*, translate::*};
 #[cfg(all(not(unix), docsrs))]
-use socket::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use socket::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd};
 
 glib::wrapper! {
     #[doc(alias = "GFileDescriptorBased")]
@@ -27,6 +27,12 @@ impl AsRawFd for FileDescriptorBased {
     }
 }
 
+impl AsFd for FileDescriptorBased {
+    fn as_fd(&self) -> BorrowedFd<'_> {
+        unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
+    }
+}
+
 pub trait FileDescriptorBasedExtManual: IsA<FileDescriptorBased> + 'static {
     #[doc(alias = "g_file_descriptor_based_get_fd")]
     #[doc(alias = "get_fd")]

gio/src/list_store.rs

@@ -150,34 +150,53 @@ impl ListStore {
             (*func)(&a).into_glib()
         }
 
-        unsafe {
-            // GIO requires a non-NULL item to be passed in so we're constructing a fake item here.
-            // See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3284
+        let mut func = equal_func;
+        let func_obj: &mut (dyn FnMut(&Object) -> bool) = &mut func;
+        let func_ptr = &func_obj as *const &mut (dyn FnMut(&Object) -> bool) as glib::ffi::gpointer;
+        let mut position = std::mem::MaybeUninit::uninit();
+
+        // GIO prior to 2.76 requires a non-NULL item to be passed in so we're constructing a fake item here.
+        // See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3284
+        #[cfg(not(feature = "v2_76"))]
+        let result = unsafe {
+            let g_class: *mut glib::gobject_ffi::GTypeClass =
+                glib::gobject_ffi::g_type_class_peek(self.item_type().into_glib()) as *mut _;
+
+            // g_class will be `NULL` when no instance of the `item-type` has been created yet.
+            // See https://github.com/gtk-rs/gtk-rs-core/issues/1767
+            if g_class.is_null() {
+                return None;
+            }
+
             let item = glib::gobject_ffi::GObject {
-                g_type_instance: glib::gobject_ffi::GTypeInstance {
-                    g_class: glib::gobject_ffi::g_type_class_peek(self.item_type().into_glib())
-                        as *mut _,
-                },
+                g_type_instance: glib::gobject_ffi::GTypeInstance { g_class },
                 ref_count: 1,
                 qdata: std::ptr::null_mut(),
             };
-            let mut func = equal_func;
-            let func_obj: &mut (dyn FnMut(&Object) -> bool) = &mut func;
-            let func_ptr =
-                &func_obj as *const &mut (dyn FnMut(&Object) -> bool) as glib::ffi::gpointer;
 
-            let mut position = std::mem::MaybeUninit::uninit();
-
-            let found = bool::from_glib(ffi::g_list_store_find_with_equal_func_full(
+            bool::from_glib(ffi::g_list_store_find_with_equal_func_full(
                 self.to_glib_none().0,
                 mut_override(&item as *const _),
                 Some(equal_func_trampoline),
                 func_ptr,
                 position.as_mut_ptr(),
-            ));
+            ))
+            .then(|| position.assume_init())
+        };
 
-            found.then(|| position.assume_init())
-        }
+        #[cfg(feature = "v2_76")]
+        let result = unsafe {
+            bool::from_glib(ffi::g_list_store_find_with_equal_func_full(
+                self.to_glib_none().0,
+                std::ptr::null_mut(),
+                Some(equal_func_trampoline),
+                func_ptr,
+                position.as_mut_ptr(),
+            ))
+            .then(|| position.assume_init())
+        };
+
+        result
     }
 }
 

gio/sys/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 19ccbbc9a3d1)
-from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)
+from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)

glib/Cargo.toml

@@ -36,7 +36,7 @@ memchr = "2.7.5"
 tempfile = "3"
 gir-format-check.workspace = true
 trybuild2 = "1"
-criterion = "0.6.0"
+criterion = "0.7.0"
 
 [features]
 default = ["gio"]
@@ -64,6 +64,10 @@ gio = ["gio-sys"]
 name = "subclass_compiletest"
 required-features = ["compiletests"]
 
+[[test]]
+name = "regex_compiletest"
+required-features = ["compiletests"]
+
 [[bench]]
 name = "gstring"
 harness = false