Add non_exhaustive to input enums

This change was meant to be squashed into #131 before landing
rust-mobile · Oct 16, 2023 · a92237f · a92237f
1 parent 969ba5a
commit a92237f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
@@ -20,6 +20,7 @@ pub use sdk::*;
 /// SDK integer values.
 ///
 #[derive(Debug, Clone, Copy, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum Source {
     BluetoothStylus = 0x0000c002,
@@ -215,6 +216,7 @@ impl From<ndk::event::MetaState> for MetaState {
 /// SDK integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum MotionAction {
     Down = ndk_sys::AMOTION_EVENT_ACTION_DOWN,
@@ -250,6 +252,7 @@ pub enum MotionAction {
 /// SDK integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum Axis {
     X = ndk_sys::AMOTION_EVENT_AXIS_X,
@@ -317,6 +320,7 @@ pub enum Axis {
 /// integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum ToolType {
     /// Unknown tool type.
@@ -451,6 +455,7 @@ impl From<ndk::event::MotionEventFlags> for MotionEventFlags {
 /// integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum KeyAction {
     Down = ndk_sys::AKEY_EVENT_ACTION_DOWN,
@@ -476,6 +481,7 @@ pub enum KeyAction {
 /// integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum Keycode {
     Unknown = ndk_sys::AKEYCODE_UNKNOWN,

diff --git a/android-activity/src/input/sdk.rs b/android-activity/src/input/sdk.rs
@@ -32,6 +32,7 @@ use crate::{
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, Hash, num_enum::FromPrimitive, num_enum::IntoPrimitive,
 )]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum KeyboardType {
     /// A numeric (12-key) keyboard.