Breaking: Make WebWindowHandle and Win32WindowHandle !Send and !Sync

rust-windowing · Mar 21, 2024 · 191fffe · 191fffe
1 parent 83e5785
commit 191fffe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -463,9 +463,9 @@ mod tests {
         assert_not_impl_any!(WaylandWindowHandle: Send, Sync);
         assert_impl_all!(DrmWindowHandle: Send, Sync);
         assert_not_impl_any!(GbmWindowHandle: Send, Sync);
-        assert_impl_all!(Win32WindowHandle: Send, Sync);
+        assert_not_impl_any!(Win32WindowHandle: Send, Sync);
         assert_not_impl_any!(WinRtWindowHandle: Send, Sync);
-        assert_impl_all!(WebWindowHandle: Send, Sync);
+        assert_not_impl_any!(WebWindowHandle: Send, Sync);
         assert_not_impl_any!(WebCanvasWindowHandle: Send, Sync);
         assert_not_impl_any!(WebOffscreenCanvasWindowHandle: Send, Sync);
         assert_not_impl_any!(AndroidNdkWindowHandle: Send, Sync);

diff --git a/src/web.rs b/src/web.rs
@@ -1,4 +1,5 @@
 use core::ffi::c_void;
+use core::marker::PhantomData;
 use core::ptr::NonNull;
 
 use super::DisplayHandle;
@@ -55,6 +56,7 @@ pub struct WebWindowHandle {
     ///
     /// [data attributes]: https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/data-*
     pub id: u32,
+    _marker: PhantomData<*const ()>,
 }
 
 impl WebWindowHandle {
@@ -70,7 +72,10 @@ impl WebWindowHandle {
     /// let handle = WebWindowHandle::new(id);
     /// ```
     pub fn new(id: u32) -> Self {
-        Self { id }
+        Self {
+            id,
+            _marker: PhantomData,
+        }
     }
 }
 

diff --git a/src/windows.rs b/src/windows.rs
@@ -1,4 +1,5 @@
 use core::ffi::c_void;
+use core::marker::PhantomData;
 use core::num::NonZeroIsize;
 use core::ptr::NonNull;
 
@@ -54,6 +55,7 @@ pub struct Win32WindowHandle {
     pub hwnd: NonZeroIsize,
     /// The `GWLP_HINSTANCE` associated with this type's `HWND`.
     pub hinstance: Option<NonZeroIsize>,
+    _marker: PhantomData<*const ()>,
 }
 
 impl Win32WindowHandle {
@@ -80,6 +82,7 @@ impl Win32WindowHandle {
         Self {
             hwnd,
             hinstance: None,
+            _marker: PhantomData,
         }
     }
 }