migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 07:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
daxpedda
2024-07-14 13:14:32 +02:00
committed by Kirill Chibisov
parent 71dea4637d
commit 6509f8a18b
15 changed files with 31 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

@@ -157,7 +157,7 @@ impl From<u64> for WindowId {
}
impl WindowId {
pub const unsafe fn dummy() -> Self {
pub const fn dummy() -> Self {
Self(0)
}
}
@@ -171,11 +171,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

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