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

Make DeviceId/WindowId::dummy() safe (#3784)

Browse source
This commit is contained in:
daxpedda 2024-07-14 13:14:32 +02:00 • committed by GitHub
parent bf97def398
commit 5b8f5cb54a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/platform_impl/linux/mod.rs
View file

@ -155,7 +155,7 @@ impl From<u64> for WindowId {
}
impl WindowId {
pub const unsafe fn dummy() -> Self {
pub const fn dummy() -> Self {
Self(0)
}
}
@ -169,11 +169,11 @@ pub enum DeviceId {
}
impl DeviceId {
pub const unsafe fn dummy() -> Self {
pub const fn dummy() -> Self {
#[cfg(wayland_platform)]
return DeviceId::Wayland(unsafe { wayland::DeviceId::dummy() });
return DeviceId::Wayland(wayland::DeviceId::dummy());
#[cfg(all(not(wayland_platform), x11_platform))]
return DeviceId::X(unsafe { x11::DeviceId::dummy() });
return DeviceId::X(x11::DeviceId::dummy());
}
}

2
src/platform_impl/linux/wayland/mod.rs
View file

@ -66,7 +66,7 @@ impl From<WaylandError> for OsError {
pub struct DeviceId;
impl DeviceId {
pub const unsafe fn dummy() -> Self {
pub const fn dummy() -> Self {
DeviceId
}
}

2
src/platform_impl/linux/x11/mod.rs
View file

@ -768,7 +768,7 @@ pub struct DeviceId(xinput::DeviceId);
impl DeviceId {
#[allow(unused)]
pub const unsafe fn dummy() -> Self {
pub const fn dummy() -> Self {
DeviceId(0)
}
}