alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid_value lint triggering on mem::zeroed of CFRunLoopSourceContext (#1271)

Browse source
This commit is contained in:
Thom Chiovoloni 2019-11-11 14:50:31 -08:00 committed by Hal Gentz
parent 9828f368d6
commit cd39327ea2
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/platform_impl/macos/event_loop.rs
View file

@ -132,7 +132,7 @@ impl<T> Proxy<T> {
// process user events through the normal OS EventLoop mechanisms. // process user events through the normal OS EventLoop mechanisms.
let rl = CFRunLoopGetMain(); let rl = CFRunLoopGetMain();
let mut context: CFRunLoopSourceContext = mem::zeroed(); let mut context: CFRunLoopSourceContext = mem::zeroed();
context.perform = event_loop_proxy_handler; context.perform = Some(event_loop_proxy_handler);
let source = let source =
CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::max_value() - 1, &mut context); CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::max_value() - 1, &mut context);
CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes); CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes);

16
src/platform_impl/macos/observer.rs
View file

@ -93,14 +93,14 @@ pub enum CFRunLoopTimerContext {}
pub struct CFRunLoopSourceContext { pub struct CFRunLoopSourceContext {
pub version: CFIndex, pub version: CFIndex,
pub info: *mut c_void, pub info: *mut c_void,
pub retain: extern "C" fn(*const c_void) -> *const c_void, pub retain: Option<extern "C" fn(*const c_void) -> *const c_void>,
pub release: extern "C" fn(*const c_void), pub release: Option<extern "C" fn(*const c_void)>,
pub copyDescription: extern "C" fn(*const c_void) -> CFStringRef, pub copyDescription: Option<extern "C" fn(*const c_void) -> CFStringRef>,
pub equal: extern "C" fn(*const c_void, *const c_void) -> ffi::Boolean, pub equal: Option<extern "C" fn(*const c_void, *const c_void) -> ffi::Boolean>,
pub hash: extern "C" fn(*const c_void) -> CFHashCode, pub hash: Option<extern "C" fn(*const c_void) -> CFHashCode>,
pub schedule: extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode), pub schedule: Option<extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode)>,
pub cancel: extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode), pub cancel: Option<extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode)>,
pub perform: extern "C" fn(*mut c_void), pub perform: Option<extern "C" fn(*mut c_void)>,
} }
// begin is queued with the highest priority to ensure it is processed before other observers // begin is queued with the highest priority to ensure it is processed before other observers