Skip to content

Commit 2fc582a

Browse files
fengalinsdroege
authored andcommitted
gio: fix compilation with beta toolchain
1 parent 3e24857 commit 2fc582a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

gio/src/list_store.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ impl ListStore {
2525
) -> u32 {
2626
unsafe {
2727
let mut func = compare_func;
28-
let func_obj: &mut (dyn FnMut(&Object, &Object) -> Ordering) = &mut func;
29-
let func_ptr = &func_obj as *const &mut (dyn FnMut(&Object, &Object) -> Ordering)
28+
let func_obj: &mut dyn FnMut(&Object, &Object) -> Ordering = &mut func;
29+
let func_ptr = &func_obj as *const &mut dyn FnMut(&Object, &Object) -> Ordering
3030
as glib::ffi::gpointer;
3131

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

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

229229
let a = from_glib_borrow(a as *mut glib::gobject_ffi::GObject);
230230
let b = from_glib_borrow(b as *mut glib::gobject_ffi::GObject);

0 commit comments

Comments
 (0)