Skip to content

Commit 4f27a6f

Browse files
committed
Simplify a few pointer casts
1 parent d350915 commit 4f27a6f

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

cairo/src/rectangle.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ gvalue_impl_inline!(
141141
impl Rectangle {
142142
#[inline]
143143
pub fn to_raw_none(&self) -> *mut ffi::cairo_rectangle_t {
144-
let ptr = self as *const Rectangle as usize;
145-
ptr as *mut ffi::cairo_rectangle_t
144+
&self.0 as *const ffi::cairo_rectangle_t as *mut ffi::cairo_rectangle_t
146145
}
147146
}
148147

cairo/src/rectangle_int.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ gvalue_impl_inline!(
141141
impl RectangleInt {
142142
#[inline]
143143
pub fn to_raw_none(&self) -> *mut ffi::cairo_rectangle_int_t {
144-
let ptr = self as *const RectangleInt as usize;
145-
ptr as *mut ffi::cairo_rectangle_int_t
144+
&self.0 as *const ffi::cairo_rectangle_int_t as *mut ffi::cairo_rectangle_int_t
146145
}
147146
}

gio/src/desktop_app_info.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ pub trait DesktopAppInfoExtManual: sealed::Sealed + IsA<DesktopAppInfo> {
8989
) {
9090
let appinfo = from_glib_borrow(appinfo);
9191
let pid = from_glib(pid);
92-
let callback: *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
93-
user_data as *const _ as usize
94-
as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
92+
let callback = user_data as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
9593
if let Some(ref mut callback) = *callback {
9694
callback(&appinfo, pid)
9795
} else {
@@ -116,7 +114,7 @@ pub trait DesktopAppInfoExtManual: sealed::Sealed + IsA<DesktopAppInfo> {
116114
user_setup,
117115
Box_::into_raw(super_callback0) as *mut _,
118116
pid_callback,
119-
super_callback1 as *const _ as usize as *mut _,
117+
super_callback1 as *const _ as *mut _,
120118
stdin_fd.as_raw_fd(),
121119
stdout_fd.as_raw_fd(),
122120
stderr_fd.as_raw_fd(),

0 commit comments

Comments
 (0)