leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make EventLoopProxy Sync

Browse source 
Co-authored-by: daxpedda <daxpedda@gmail.com>
Closes: #3448
This commit is contained in:
Mads Marquart 2024-02-01 14:27:44 +01:00 • committed by Kirill Chibisov
parent e61a7320a2
commit 31f8b816bd
9 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/platform_impl/web/async/wrapper.rs
View file

@ -6,14 +6,14 @@ use std::sync::Arc;
// Unsafe wrapper type that allows us to use `T` when it's not `Send` from other threads.
// `value` **must** only be accessed on the main thread.
pub struct Wrapper<const SYNC: bool, V: 'static, S: Clone + Send, E> {
value: Value<SYNC, V>,
pub struct Wrapper<V: 'static, S: Clone + Send, E> {
value: Value<V>,
handler: fn(&RefCell<Option<V>>, E),
sender_data: S,
sender_handler: fn(&S, E),
}
struct Value<const SYNC: bool, V> {
struct Value<V> {
// SAFETY:
// This value must not be accessed if not on the main thread.
//
@ -28,11 +28,11 @@ struct Value<const SYNC: bool, V> {
}
// SAFETY: See `Self::value`.
unsafe impl<const SYNC: bool, V> Send for Value<SYNC, V> {}
unsafe impl<V> Send for Value<V> {}
// SAFETY: See `Self::value`.
unsafe impl<V> Sync for Value<true, V> {}
unsafe impl<V> Sync for Value<V> {}
impl<const SYNC: bool, V, S: Clone + Send, E> Wrapper<SYNC, V, S, E> {
impl<V, S: Clone + Send, E> Wrapper<V, S, E> {
#[track_caller]
pub fn new<R: Future<Output = ()>>(
_: MainThreadMarker,
@ -81,7 +81,7 @@ impl<const SYNC: bool, V, S: Clone + Send, E> Wrapper<SYNC, V, S, E> {
}
}
impl<const SYNC: bool, V, S: Clone + Send, E> Clone for Wrapper<SYNC, V, S, E> {
impl<V, S: Clone + Send, E> Clone for Wrapper<V, S, E> {
fn clone(&self) -> Self {
Self {
value: Value {