Skip to content

gio: fix compilation with beta toolchain #1808

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 1 commit into from
Sep 5, 2025
Merged

gio: fix compilation with beta toolchain #1808

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions gio/src/list_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ impl ListStore {
) -> u32 {
unsafe {
let mut func = compare_func;
let func_obj: &mut (dyn FnMut(&Object, &Object) -> Ordering) = &mut func;
let func_ptr = &func_obj as *const &mut (dyn FnMut(&Object, &Object) -> Ordering)
let func_obj: &mut dyn FnMut(&Object, &Object) -> Ordering = &mut func;
let func_ptr = &func_obj as *const &mut dyn FnMut(&Object, &Object) -> Ordering
as glib::ffi::gpointer;

ffi::g_list_store_insert_sorted(
Expand All @@ -42,8 +42,8 @@ impl ListStore {
pub fn sort<F: FnMut(&Object, &Object) -> Ordering>(&self, compare_func: F) {
unsafe {
let mut func = compare_func;
let func_obj: &mut (dyn FnMut(&Object, &Object) -> Ordering) = &mut func;
let func_ptr = &func_obj as *const &mut (dyn FnMut(&Object, &Object) -> Ordering)
let func_obj: &mut dyn FnMut(&Object, &Object) -> Ordering = &mut func;
let func_ptr = &func_obj as *const &mut dyn FnMut(&Object, &Object) -> Ordering
as glib::ffi::gpointer;

ffi::g_list_store_sort(
Expand Down Expand Up @@ -224,7 +224,7 @@ unsafe extern "C" fn compare_func_trampoline(
b: glib::ffi::gconstpointer,
func: glib::ffi::gpointer,
) -> i32 {
let func = func as *mut &mut (dyn FnMut(&Object, &Object) -> Ordering);
let func = func as *mut &mut dyn FnMut(&Object, &Object) -> Ordering;

let a = from_glib_borrow(a as *mut glib::gobject_ffi::GObject);
let b = from_glib_borrow(b as *mut glib::gobject_ffi::GObject);
Expand Down
Loading