Skip to content

Commit 3973c0a

Browse files
committed
gtk4: fix userdata mutability for FnMut callbacks
1 parent d895644 commit 3973c0a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

gsk4/src/path.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl Path {
1111
flags: PathForeachFlags,
1212
func: P,
1313
) -> glib::ControlFlow {
14-
let func_data: P = func;
14+
let mut func_data: P = func;
1515
unsafe extern "C" fn func_func<
1616
P: FnMut(&PathOperation, &graphene::Point, usize, f32) -> glib::ControlFlow,
1717
>(
@@ -23,17 +23,17 @@ impl Path {
2323
) -> glib::ffi::gboolean {
2424
let op = from_glib(op);
2525
let pts = from_glib_borrow(pts);
26-
let callback: *mut P = user_data as *const _ as usize as *mut P;
26+
let callback = user_data as *mut P;
2727
(*callback)(&op, &pts, n_pts, weight).into_glib()
2828
}
2929
let func = Some(func_func::<P> as _);
30-
let super_callback0: &P = &func_data;
30+
let super_callback0: &mut P = &mut func_data;
3131
unsafe {
3232
from_glib(ffi::gsk_path_foreach(
3333
self.to_glib_none().0,
3434
flags.into_glib(),
3535
func,
36-
super_callback0 as *const _ as usize as *mut _,
36+
super_callback0 as *mut _ as *mut _,
3737
))
3838
}
3939
}

gsk4/src/render_node.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl RenderNode {
3636
error_func: P,
3737
) -> Option<Self> {
3838
assert_initialized_main_thread!();
39-
let error_func_data: P = error_func;
39+
let mut error_func_data: P = error_func;
4040
unsafe extern "C" fn error_func_func<
4141
P: FnMut(&ParseLocation, &ParseLocation, &glib::Error),
4242
>(
@@ -48,16 +48,16 @@ impl RenderNode {
4848
let start = from_glib_borrow(start);
4949
let end = from_glib_borrow(end);
5050
let error = from_glib_borrow(error);
51-
let callback: *mut P = user_data as *const _ as usize as *mut P;
51+
let callback = user_data as *mut P;
5252
(*callback)(&start, &end, &error);
5353
}
5454
let error_func = Some(error_func_func::<P> as _);
55-
let super_callback0: &P = &error_func_data;
55+
let super_callback0: &mut P = &mut error_func_data;
5656
unsafe {
5757
from_glib_full(ffi::gsk_render_node_deserialize(
5858
bytes.to_glib_none().0,
5959
error_func,
60-
super_callback0 as *const _ as usize as *mut _,
60+
super_callback0 as *mut _ as *mut _,
6161
))
6262
}
6363
}

0 commit comments

Comments
 (0)