Skip to content

Automated PR: Changes from updating gir/gir-files #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 22, 2025
Merged

Automated PR: Changes from updating gir/gir-files #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fe1dbf
Update gir-files
github-actions[bot] May 22, 2025
d1813ff
Regenerate with latest gir-files
github-actions[bot] May 22, 2025
d6cb9cb
glib/sys: Add aliases for some gtypes
bilelmoussaoui May 22, 2025
d7e5377
glib/sys: Manually implement g_atomic_int_get
bilelmoussaoui May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gdk-pixbuf/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion gdk-pixbuf/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions gio/src/auto/file_monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ pub trait FileMonitorExt: IsA<FileMonitor> + 'static {
fn emit_event(
&self,
child: &impl IsA<File>,
other_file: &impl IsA<File>,
other_file: Option<&impl IsA<File>>,
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(),
);
}
Expand Down
2 changes: 1 addition & 1 deletion gio/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions gio/src/auto/vfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ unsafe impl Sync for Vfs {}
pub trait VfsExt: IsA<Vfs> + '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<std::path::Path>) -> 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,
))
}
}
Expand Down
2 changes: 1 addition & 1 deletion gio/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion gir-files
Open in desktop
Submodule gir-files updated 3 files
+54 −54 GLib-2.0.gir
+6 −6 Gio-2.0.gir
+26 −26 HarfBuzz-0.0.gir
2 changes: 1 addition & 1 deletion glib/gobject-sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion glib/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 4 additions & 0 deletions glib/sys/Gir.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
33 changes: 16 additions & 17 deletions glib/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down
7 changes: 7 additions & 0 deletions glib/sys/src/manual.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))]
Expand Down Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion glib/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion graphene/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion graphene/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion pango/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion pango/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion pangocairo/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion pangocairo/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Loading