Skip to content

fix from_raw_with_void_ptr lint #47

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix from_raw_with_void_ptr lint #47

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
19 changes: 8 additions & 11 deletions src/xkb/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,25 +792,22 @@ impl Keymap {
) where
F: FnMut(&Keymap, Keycode),
{
let mut data_box: Box<(&Keymap, F)> = mem::transmute(Box::from_raw(data));
{
let (keymap, ref mut closure) = *data_box;
closure(keymap, key.into());
}
let _ = Box::into_raw(data_box);
let (keymap, closure) = &mut *data.cast::<(&Keymap, F)>();
closure(keymap, key.into());
}

/// Run a specified closure for every valid keycode in the keymap.
pub fn key_for_each<F>(&self, closure: F)
where
F: FnMut(&Keymap, Keycode),
{
let data_box = Box::new((self, closure));
let data_ptr = Box::into_raw(data_box).cast();

let mut data = (self, closure);
unsafe {
ffi::xkb_keymap_key_for_each(self.get_raw_ptr(), Self::callback::<F>, data_ptr);
mem::drop(Box::from_raw(data_ptr.cast::<(&Keymap, F)>()));
ffi::xkb_keymap_key_for_each(
self.get_raw_ptr(),
Self::callback::<F>,
&mut data as *mut _ as *mut _,
);
}
}

Expand Down