From 137664ca88a9bf2398380fd1c04b00c62c868383 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 30 Apr 2020 04:59:07 +0200
Subject: Move `keyboard::Event` to `iced_core`

---
 core/src/keyboard.rs               |  2 ++
 core/src/keyboard/event.rs         | 31 +++++++++++++++++++++++++++++++
 native/src/input/keyboard.rs       |  5 +----
 native/src/input/keyboard/event.rs | 31 -------------------------------
 native/src/input/mouse.rs          |  2 +-
 5 files changed, 35 insertions(+), 36 deletions(-)
 create mode 100644 core/src/keyboard/event.rs
 delete mode 100644 native/src/input/keyboard/event.rs

diff --git a/core/src/keyboard.rs b/core/src/keyboard.rs
index d98b2989..b26bdb3d 100644
--- a/core/src/keyboard.rs
+++ b/core/src/keyboard.rs
@@ -1,6 +1,8 @@
 //! Reuse basic keyboard types.
+mod event;
 mod key_code;
 mod modifiers_state;
 
+pub use event::Event;
 pub use key_code::KeyCode;
 pub use modifiers_state::ModifiersState;
diff --git a/core/src/keyboard/event.rs b/core/src/keyboard/event.rs
new file mode 100644
index 00000000..bc8437a8
--- /dev/null
+++ b/core/src/keyboard/event.rs
@@ -0,0 +1,31 @@
+use super::{KeyCode, ModifiersState};
+
+/// A keyboard event.
+///
+/// _**Note:** This type is largely incomplete! If you need to track
+/// additional events, feel free to [open an issue] and share your use case!_
+///
+/// [open an issue]: https://github.com/hecrj/iced/issues
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Event {
+    /// A keyboard key was pressed.
+    KeyPressed {
+        /// The key identifier
+        key_code: KeyCode,
+
+        /// The state of the modifier keys
+        modifiers: ModifiersState,
+    },
+
+    /// A keyboard key was released.
+    KeyReleased {
+        /// The key identifier
+        key_code: KeyCode,
+
+        /// The state of the modifier keys
+        modifiers: ModifiersState,
+    },
+
+    /// A unicode character was received.
+    CharacterReceived(char),
+}
diff --git a/native/src/input/keyboard.rs b/native/src/input/keyboard.rs
index 220b7f17..012538e3 100644
--- a/native/src/input/keyboard.rs
+++ b/native/src/input/keyboard.rs
@@ -1,5 +1,2 @@
-//! Build keyboard events.
-mod event;
-
-pub use event::Event;
+//! Track keyboard events.
 pub use iced_core::keyboard::*;
diff --git a/native/src/input/keyboard/event.rs b/native/src/input/keyboard/event.rs
deleted file mode 100644
index bc8437a8..00000000
--- a/native/src/input/keyboard/event.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use super::{KeyCode, ModifiersState};
-
-/// A keyboard event.
-///
-/// _**Note:** This type is largely incomplete! If you need to track
-/// additional events, feel free to [open an issue] and share your use case!_
-///
-/// [open an issue]: https://github.com/hecrj/iced/issues
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Event {
-    /// A keyboard key was pressed.
-    KeyPressed {
-        /// The key identifier
-        key_code: KeyCode,
-
-        /// The state of the modifier keys
-        modifiers: ModifiersState,
-    },
-
-    /// A keyboard key was released.
-    KeyReleased {
-        /// The key identifier
-        key_code: KeyCode,
-
-        /// The state of the modifier keys
-        modifiers: ModifiersState,
-    },
-
-    /// A unicode character was received.
-    CharacterReceived(char),
-}
diff --git a/native/src/input/mouse.rs b/native/src/input/mouse.rs
index ae3f1596..9ee406cf 100644
--- a/native/src/input/mouse.rs
+++ b/native/src/input/mouse.rs
@@ -1,4 +1,4 @@
-//! Build mouse events.
+//! Track mouse events.
 
 pub mod click;
 
-- 
cgit