Skip to content

Commit a0d5234

Browse files
sdroegesdroege
authored
Merge pull request #1233 from sdroege/simplify-pointer-casts
Simplify pointer casts
2 parents d350915 + f49c2c0 commit a0d5234

File tree

27 files changed

+58
-63
lines changed

27 files changed

+58
-63
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
}

‎gdk-pixbuf/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
1+
Generated by gir (https://github.com/gtk-rs/gir @ a2f936b77195)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

‎gdk-pixbuf/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
1+
Generated by gir (https://github.com/gtk-rs/gir @ a2f936b77195)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

‎gio/src/auto/desktop_app_info.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ impl DesktopAppInfo {
209209
) -> Result<(), glib::Error> {
210210
let user_setup_data: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::new(user_setup);
211211
unsafe extern "C" fn user_setup_func(data: glib::ffi::gpointer) {
212-
let callback: Box_<Option<Box_<dyn FnOnce() + 'static>>> =
213-
Box_::from_raw(data as *mut _);
212+
let callback = Box_::from_raw(data as *mut Option<Box_<dyn FnOnce() + 'static>>);
214213
let callback = (*callback).expect("cannot get closure...");
215214
callback()
216215
}
@@ -227,9 +226,7 @@ impl DesktopAppInfo {
227226
) {
228227
let appinfo = from_glib_borrow(appinfo);
229228
let pid = from_glib(pid);
230-
let callback: *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
231-
user_data as *const _ as usize
232-
as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
229+
let callback = user_data as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
233230
if let Some(ref mut callback) = *callback {
234231
callback(&appinfo, pid)
235232
} else {
@@ -254,7 +251,7 @@ impl DesktopAppInfo {
254251
user_setup,
255252
Box_::into_raw(super_callback0) as *mut _,
256253
pid_callback,
257-
super_callback1 as *const _ as usize as *mut _,
254+
super_callback1 as *const _ as *mut _,
258255
&mut error,
259256
);
260257
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());

‎gio/src/auto/file.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + 'static {
235235
total_num_bytes: i64,
236236
data: glib::ffi::gpointer,
237237
) {
238-
let callback: *mut Option<&mut dyn (FnMut(i64, i64))> =
239-
data as *const _ as usize as *mut Option<&mut dyn (FnMut(i64, i64))>;
238+
let callback = data as *mut Option<&mut dyn (FnMut(i64, i64))>;
240239
if let Some(ref mut callback) = *callback {
241240
callback(current_num_bytes, total_num_bytes)
242241
} else {
@@ -257,7 +256,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + 'static {
257256
flags.into_glib(),
258257
cancellable.map(|p| p.as_ref()).to_glib_none().0,
259258
progress_callback,
260-
super_callback0 as *const _ as usize as *mut _,
259+
super_callback0 as *const _ as *mut _,
261260
&mut error,
262261
);
263262
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
@@ -1375,8 +1374,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + 'static {
13751374
total_num_bytes: i64,
13761375
data: glib::ffi::gpointer,
13771376
) {
1378-
let callback: *mut Option<&mut dyn (FnMut(i64, i64))> =
1379-
data as *const _ as usize as *mut Option<&mut dyn (FnMut(i64, i64))>;
1377+
let callback = data as *mut Option<&mut dyn (FnMut(i64, i64))>;
13801378
if let Some(ref mut callback) = *callback {
13811379
callback(current_num_bytes, total_num_bytes)
13821380
} else {
@@ -1397,7 +1395,7 @@ pub trait FileExt: IsA<File> + sealed::Sealed + 'static {
13971395
flags.into_glib(),
13981396
cancellable.map(|p| p.as_ref()).to_glib_none().0,
13991397
progress_callback,
1400-
super_callback0 as *const _ as usize as *mut _,
1398+
super_callback0 as *const _ as *mut _,
14011399
&mut error,
14021400
);
14031401
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());

‎gio/src/auto/subprocess_launcher.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ impl SubprocessLauncher {
5050
pub fn set_child_setup<P: Fn() + 'static>(&self, child_setup: P) {
5151
let child_setup_data: Box_<P> = Box_::new(child_setup);
5252
unsafe extern "C" fn child_setup_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {
53-
let callback: &P = &*(data as *mut _);
53+
let callback = &*(data as *mut P);
5454
(*callback)()
5555
}
5656
let child_setup = Some(child_setup_func::<P> as _);
5757
unsafe extern "C" fn destroy_notify_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {
58-
let _callback: Box_<P> = Box_::from_raw(data as *mut _);
58+
let _callback = Box_::from_raw(data as *mut P);
5959
}
6060
let destroy_call3 = Some(destroy_notify_func::<P> as _);
6161
let super_callback0: Box_<P> = child_setup_data;

‎gio/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
1+
Generated by gir (https://github.com/gtk-rs/gir @ a2f936b77195)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

‎gio/src/auto/vfs.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ pub trait VfsExt: IsA<Vfs> + sealed::Sealed + 'static {
104104
) -> *mut ffi::GFile {
105105
let vfs = from_glib_borrow(vfs);
106106
let identifier: Borrowed<glib::GString> = from_glib_borrow(identifier);
107-
let callback: &Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>> =
108-
&*(user_data as *mut _);
107+
let callback = &*(user_data as *mut Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>>);
109108
if let Some(ref callback) = *callback {
110109
callback(&vfs, identifier.as_str())
111110
} else {
@@ -127,8 +126,7 @@ pub trait VfsExt: IsA<Vfs> + sealed::Sealed + 'static {
127126
) -> *mut ffi::GFile {
128127
let vfs = from_glib_borrow(vfs);
129128
let identifier: Borrowed<glib::GString> = from_glib_borrow(identifier);
130-
let callback: &Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>> =
131-
&*(user_data as *mut _);
129+
let callback = &*(user_data as *mut Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>>);
132130
if let Some(ref callback) = *callback {
133131
callback(&vfs, identifier.as_str())
134132
} else {
@@ -142,13 +140,13 @@ pub trait VfsExt: IsA<Vfs> + sealed::Sealed + 'static {
142140
None
143141
};
144142
unsafe extern "C" fn uri_destroy_func(data: glib::ffi::gpointer) {
145-
let _callback: Box_<Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>>> =
146-
Box_::from_raw(data as *mut _);
143+
let _callback =
144+
Box_::from_raw(data as *mut Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>>);
147145
}
148146
let destroy_call4 = Some(uri_destroy_func as _);
149147
unsafe extern "C" fn parse_name_destroy_func(data: glib::ffi::gpointer) {
150-
let _callback: Box_<Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>>> =
151-
Box_::from_raw(data as *mut _);
148+
let _callback =
149+
Box_::from_raw(data as *mut Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>>);
152150
}
153151
let destroy_call7 = Some(parse_name_destroy_func as _);
154152
let super_callback0: Box_<Option<Box_<dyn Fn(&Vfs, &str) -> File + 'static>>> =

‎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)