Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduced unsafe

Browse Source
This commit is contained in:
ccgauche
2021-03-02 17:41:28 +01:00
parent 6dffd1a9e2
commit bece2cfc76
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugin/derive/src/lib.rs
View File

@ -58,15 +58,17 @@ pub fn event_handler(_args: TokenStream, item: TokenStream) -> TokenStream {
// Artificially force the event handler to be type-correct // Artificially force the event handler to be type-correct
fn force_event<E: ::veloren_plugin_rt::api::Event>(event: E, inner: fn(E, &mut PLUGIN_STATE_TYPE) -> E::Response) -> E::Response { fn force_event<E: ::veloren_plugin_rt::api::Event>(event: E, inner: fn(E, &mut PLUGIN_STATE_TYPE) -> E::Response) -> E::Response {
//let mut plugin_state = PLUGIN_STATE.lock().unwrap(); //let mut plugin_state = PLUGIN_STATE.lock().unwrap();
unsafe {
assert_eq!(PLUGIN_STATE_GUARD.swap(true, std::sync::atomic::Ordering::Acquire), false); assert_eq!(PLUGIN_STATE_GUARD.swap(true, std::sync::atomic::Ordering::Acquire), false);
if PLUGIN_STATE.is_none() { unsafe {
PLUGIN_STATE = Some(PLUGIN_STATE_TYPE::default()); if PLUGIN_STATE.is_none() {
PLUGIN_STATE = Some(PLUGIN_STATE_TYPE::default());
}
} }
let out = inner(event, PLUGIN_STATE.as_mut().unwrap()); let out = inner(event, unsafe {PLUGIN_STATE.as_mut().unwrap()});
PLUGIN_STATE_GUARD.store(false, std::sync::atomic::Ordering::Release); PLUGIN_STATE_GUARD.store(false, std::sync::atomic::Ordering::Release);
out out
}
} }
::veloren_plugin_rt::write_output(&force_event(input, inner)) ::veloren_plugin_rt::write_output(&force_event(input, inner))
} }