diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/gio/src/auto/file_monitor.rs b/gio/src/auto/file_monitor.rs index b12356fbb456..2ab82e2bab79 100644 --- a/gio/src/auto/file_monitor.rs +++ b/gio/src/auto/file_monitor.rs @@ -34,14 +34,14 @@ pub trait FileMonitorExt: IsA + 'static { fn emit_event( &self, child: &impl IsA, - other_file: &impl IsA, + other_file: Option<&impl IsA>, event_type: FileMonitorEvent, ) { unsafe { ffi::g_file_monitor_emit_event( self.as_ref().to_glib_none().0, child.as_ref().to_glib_none().0, - other_file.as_ref().to_glib_none().0, + other_file.map(|p| p.as_ref()).to_glib_none().0, event_type.into_glib(), ); } diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/gio/src/auto/vfs.rs b/gio/src/auto/vfs.rs index 0de787ea7300..f0956f45f127 100644 --- a/gio/src/auto/vfs.rs +++ b/gio/src/auto/vfs.rs @@ -38,11 +38,11 @@ unsafe impl Sync for Vfs {} pub trait VfsExt: IsA + 'static { #[doc(alias = "g_vfs_get_file_for_path")] #[doc(alias = "get_file_for_path")] - fn file_for_path(&self, path: &str) -> File { + fn file_for_path(&self, path: impl AsRef) -> File { unsafe { from_glib_full(ffi::g_vfs_get_file_for_path( self.as_ref().to_glib_none().0, - path.to_glib_none().0, + path.as_ref().to_glib_none().0, )) } } diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- a/gio/sys/versions.txt +++ b/gio/sys/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/gir-files b/gir-files index 5262e0fefdc7..f5f1ab94657c 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 5262e0fefdc77120e81e62fe32257a84f11a64bf +Subproject commit f5f1ab94657c752b116e4b71563d5af7d4ba4347 diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/glib/sys/Gir.toml b/glib/sys/Gir.toml index 7fd4b7be93ea..e5340b26ca88 100644 --- a/glib/sys/Gir.toml +++ b/glib/sys/Gir.toml @@ -74,6 +74,10 @@ status = "generate" # see https://gitlab.gnome.org/GNOME/glib/-/issues/3231 + majority of those are available through std ignore = true [[object.function]] + name = "atomic_int_get" + # generates a type using *const volatile instead of *const gint or so. + manual = true + [[object.function]] name = "unix_get_passwd_entry" cfg_condition = "unix" [[object.function]] diff --git a/glib/sys/src/lib.rs b/glib/sys/src/lib.rs index 4cf6c049fa71..9d98c445df9b 100644 --- a/glib/sys/src/lib.rs +++ b/glib/sys/src/lib.rs @@ -6260,31 +6260,30 @@ extern "C" { expr: *const c_char, ); pub fn g_atexit(func: GVoidFunc); - pub fn g_atomic_int_add(atomic: *mut c_int, val: c_int) -> c_int; - pub fn g_atomic_int_and(atomic: *mut c_uint, val: c_uint) -> c_uint; + pub fn g_atomic_int_add(atomic: *mut gint, val: c_int) -> c_int; + pub fn g_atomic_int_and(atomic: *mut guint, val: c_uint) -> c_uint; pub fn g_atomic_int_compare_and_exchange( - atomic: *mut c_int, + atomic: *mut gint, oldval: c_int, newval: c_int, ) -> gboolean; #[cfg(feature = "v2_74")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_74")))] pub fn g_atomic_int_compare_and_exchange_full( - atomic: *mut c_int, + atomic: *mut gint, oldval: c_int, newval: c_int, preval: *mut c_int, ) -> gboolean; - pub fn g_atomic_int_dec_and_test(atomic: *mut c_int) -> gboolean; + pub fn g_atomic_int_dec_and_test(atomic: *mut gint) -> gboolean; #[cfg(feature = "v2_74")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_74")))] - pub fn g_atomic_int_exchange(atomic: *mut c_int, newval: c_int) -> c_int; - pub fn g_atomic_int_exchange_and_add(atomic: *mut c_int, val: c_int) -> c_int; - pub fn g_atomic_int_get(atomic: *const c_int) -> c_int; - pub fn g_atomic_int_inc(atomic: *mut c_int); - pub fn g_atomic_int_or(atomic: *mut c_uint, val: c_uint) -> c_uint; - pub fn g_atomic_int_set(atomic: *mut c_int, newval: c_int); - pub fn g_atomic_int_xor(atomic: *mut c_uint, val: c_uint) -> c_uint; + pub fn g_atomic_int_exchange(atomic: *mut gint, newval: c_int) -> c_int; + pub fn g_atomic_int_exchange_and_add(atomic: *mut gint, val: c_int) -> c_int; + pub fn g_atomic_int_inc(atomic: *mut gint); + pub fn g_atomic_int_or(atomic: *mut guint, val: c_uint) -> c_uint; + pub fn g_atomic_int_set(atomic: *mut gint, newval: c_int); + pub fn g_atomic_int_xor(atomic: *mut guint, val: c_uint) -> c_uint; pub fn g_atomic_pointer_add(atomic: *mut c_void, val: ssize_t) -> intptr_t; pub fn g_atomic_pointer_and(atomic: *mut c_void, val: size_t) -> uintptr_t; pub fn g_atomic_pointer_compare_and_exchange( @@ -6365,19 +6364,19 @@ extern "C" { save: *mut c_int, ) -> size_t; pub fn g_basename(file_name: *const c_char) -> *const c_char; - pub fn g_bit_lock(address: *mut c_int, lock_bit: c_int); + pub fn g_bit_lock(address: *mut gint, lock_bit: c_int); #[cfg(feature = "v2_86")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))] - pub fn g_bit_lock_and_get(address: *mut c_int, lock_bit: c_uint, out_val: *mut c_int); + pub fn g_bit_lock_and_get(address: *mut gint, lock_bit: c_uint, out_val: *mut c_int); pub fn g_bit_nth_lsf(mask: c_ulong, nth_bit: c_int) -> c_int; pub fn g_bit_nth_msf(mask: c_ulong, nth_bit: c_int) -> c_int; pub fn g_bit_storage(number: c_ulong) -> c_uint; - pub fn g_bit_trylock(address: *mut c_int, lock_bit: c_int) -> gboolean; - pub fn g_bit_unlock(address: *mut c_int, lock_bit: c_int); + pub fn g_bit_trylock(address: *mut gint, lock_bit: c_int) -> gboolean; + pub fn g_bit_unlock(address: *mut gint, lock_bit: c_int); #[cfg(feature = "v2_86")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))] pub fn g_bit_unlock_and_set( - address: *mut c_int, + address: *mut gint, lock_bit: c_uint, new_val: c_int, preserve_mask: c_int, diff --git a/glib/sys/src/manual.rs b/glib/sys/src/manual.rs index f6152c3fd1a1..1c7874495608 100644 --- a/glib/sys/src/manual.rs +++ b/glib/sys/src/manual.rs @@ -5,6 +5,9 @@ pub use libc::passwd; #[allow(unused_imports)] use libc::{c_char, c_int, c_ushort, c_void}; +pub use libc::c_int as gint; +pub use libc::c_uint as guint; + pub type GType = libc::size_t; #[cfg(all(not(unix), docsrs))] @@ -117,3 +120,7 @@ mod win32 { pub fn g_win32_get_windows_version() -> c_uint; } } + +extern "C" { + pub fn g_atomic_int_get(atomic: *const c_int) -> c_int; +} diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- a/glib/sys/versions.txt +++ b/glib/sys/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- a/graphene/sys/versions.txt +++ b/graphene/sys/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- a/pango/sys/versions.txt +++ b/pango/sys/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- 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 @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c) diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt index d37007d58839..9c44f3dbe11d 100644 --- a/pangocairo/sys/versions.txt +++ b/pangocairo/sys/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362) -from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7) +from gir-files (https://github.com/gtk-rs/gir-files @ f5f1ab94657c)