Skip to content
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

Jump to bottom

0.20 backports #1567

Merged
merged 11 commits into from
Nov 12, 2024
Merged

0.20 backports #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
068833d
Update gir
sdroege Nov 8, 2024
056106e
Regenerate with latest gir
sdroege Nov 8, 2024
96aa7b0
pango: Fix `LayoutLine::x_ranges()` bindings
sdroege Nov 5, 2024
fba4ade
glib: fix userdata mutability for FnMut callbacks
fengalin Nov 7, 2024
f312b5a
Fix typo to get Github actions to pass
swsnr Nov 1, 2024
e9ec2d1
Update Cargo.lock
sdroege Nov 8, 2024
27e1641
Update gir-files
sdroege Nov 12, 2024
721538b
Regenerate with latest gir / gir-files
sdroege Nov 12, 2024
95d1f24
gio: Clean up and autogenerate `UnixMountEntry` bindings
sdroege Nov 11, 2024
01698a9
glib: Ignore CPP feature constants
sdroege Nov 11, 2024
a805246
glib: Add correct versions to various new unicode scripts
sdroege Nov 11, 2024
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
32 changes: 16 additions & 16 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 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 @ c954dbdc9ac0)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
from gir-files (https://github.com/gtk-rs/gir-files @ d48ffb674809)
4 changes: 2 additions & 2 deletions 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 @ c954dbdc9ac0)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc2560a9ae8)
Generated by gir (https://github.com/gtk-rs/gir @ e9ef1f366af2)
from gir-files (https://github.com/gtk-rs/gir-files @ d48ffb674809)
26 changes: 26 additions & 0 deletions gio/Gir.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,6 +1565,32 @@ concurrency = "send+sync"
cfg_condition = "unix"
[[object.derive]]
name = "Debug"
[[object.function]]
pattern = "compare|get_device_path|get_fs_type|get_mount_path|guess_can_eject|guess_name|guess_icon|guess_should_display|guess_symbolic_icon|is_readonly|is_system_internal"
version = "2.0"
[[object.function.parameter]]
pattern = ".+"
const = true
[[object.function]]
name = "get_options"
version = "2.58"
[[object.function.parameter]]
pattern = ".+"
const = true
[[object.function]]
name = "get_root_path"
version = "2.60"
[[object.function.parameter]]
pattern = ".+"
const = true
[[object.function]]
name = "at"
version = "2.0"
rename = "for_mount_path"
[[object.function]]
name = "for"
version = "2.0"
rename = "for_file_path"

[[object]]
name = "Gio.UnixMountPoint"
Expand Down
9 changes: 5 additions & 4 deletions gio/src/auto/desktop_app_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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(
Expand All @@ -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());
Expand Down
12 changes: 6 additions & 6 deletions gio/src/auto/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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(
Expand All @@ -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());
Expand Down Expand Up @@ -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,
Expand All @@ -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(
Expand All @@ -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());
Expand Down
Loading
Loading