alex/baseview
1
0
Fork 0
Code Activity

Remove unnecessary PhantomData from platform::WindowHandle definitions (#163)

Browse source 
These `PhantomData` fields are redundant, as the public `WindowHandle` struct already contains one.
This commit is contained in:
Micah Johnston 2023-12-17 02:16:36 -06:00 committed by GitHub
parent 7d14a555e5
commit 937ef965b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/macos/window.rs
View file

@ -1,6 +1,5 @@
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
use std::ffi::c_void; use std::ffi::c_void;
use std::marker::PhantomData;
use std::ptr; use std::ptr;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
@ -38,9 +37,6 @@ pub struct WindowHandle {
raw_window_handle: Option<RawWindowHandle>, raw_window_handle: Option<RawWindowHandle>,
close_requested: Arc<AtomicBool>, close_requested: Arc<AtomicBool>,
is_open: Arc<AtomicBool>, is_open: Arc<AtomicBool>,
// Ensure handle is !Send
_phantom: PhantomData<*mut ()>,
} }
impl WindowHandle { impl WindowHandle {
@ -81,7 +77,6 @@ impl ParentHandle {
raw_window_handle: Some(raw_window_handle), raw_window_handle: Some(raw_window_handle),
close_requested: Arc::clone(&close_requested), close_requested: Arc::clone(&close_requested),
is_open: Arc::clone(&is_open), is_open: Arc::clone(&is_open),
_phantom: PhantomData::default(),
}; };
(Self { _close_requested: close_requested, is_open }, handle) (Self { _close_requested: close_requested, is_open }, handle)

10
src/win/window.rs
View file

@ -21,7 +21,6 @@ use winapi::um::winuser::{
use std::cell::{Cell, Ref, RefCell, RefMut}; use std::cell::{Cell, Ref, RefCell, RefMut};
use std::collections::VecDeque; use std::collections::VecDeque;
use std::ffi::{c_void, OsStr}; use std::ffi::{c_void, OsStr};
use std::marker::PhantomData;
use std::os::windows::ffi::OsStrExt; use std::os::windows::ffi::OsStrExt;
use std::ptr::null_mut; use std::ptr::null_mut;
use std::rc::Rc; use std::rc::Rc;
@ -68,9 +67,6 @@ const WIN_FRAME_TIMER: usize = 4242;
pub struct WindowHandle { pub struct WindowHandle {
hwnd: Option<HWND>, hwnd: Option<HWND>,
is_open: Rc<Cell<bool>>, is_open: Rc<Cell<bool>>,
// Ensure handle is !Send
_phantom: PhantomData<*mut ()>,
} }
impl WindowHandle { impl WindowHandle {
@ -108,11 +104,7 @@ impl ParentHandle {
pub fn new(hwnd: HWND) -> (Self, WindowHandle) { pub fn new(hwnd: HWND) -> (Self, WindowHandle) {
let is_open = Rc::new(Cell::new(true)); let is_open = Rc::new(Cell::new(true));
let handle = WindowHandle { let handle = WindowHandle { hwnd: Some(hwnd), is_open: Rc::clone(&is_open) };
hwnd: Some(hwnd),
is_open: Rc::clone(&is_open),
_phantom: PhantomData::default(),
};
(Self { is_open }, handle) (Self { is_open }, handle)
} }

5
src/x11/window.rs
View file

@ -1,5 +1,4 @@
use std::ffi::c_void; use std::ffi::c_void;
use std::marker::PhantomData;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc; use std::sync::mpsc;
use std::sync::Arc; use std::sync::Arc;
@ -28,9 +27,6 @@ pub struct WindowHandle {
raw_window_handle: Option<RawWindowHandle>, raw_window_handle: Option<RawWindowHandle>,
close_requested: Arc<AtomicBool>, close_requested: Arc<AtomicBool>,
is_open: Arc<AtomicBool>, is_open: Arc<AtomicBool>,
// Ensure handle is !Send
_phantom: PhantomData<*mut ()>,
} }
impl WindowHandle { impl WindowHandle {
@ -75,7 +71,6 @@ impl ParentHandle {
raw_window_handle: None, raw_window_handle: None,
close_requested: Arc::clone(&close_requested), close_requested: Arc::clone(&close_requested),
is_open: Arc::clone(&is_open), is_open: Arc::clone(&is_open),
_phantom: PhantomData::default(),
}; };
(Self { close_requested, is_open }, handle) (Self { close_requested, is_open }, handle)