Revert "Add is_* and as_* methods to the event enums (crossterm-rs#949)"

This reverts commit e063091.

Author: the-mikedavis

Cargo.lock

@@ -51,7 +51,6 @@ use-dev-tty = ["filedescriptor", "rustix/process"]
 
 [dependencies]
 bitflags = { version = "2.3" }
-derive_more = { version = "1.0.0", features = ["is_variant"] }
 document-features = "0.2.10"
 futures-core = { version = "0.3", optional = true, default-features = false }
 parking_lot = "0.12"

Cargo.toml

@@ -4,42 +4,43 @@
 
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
 
-fn match_event(event: Event) {
-    if let Some(key) = event.as_key_press_event() {
-        match key {
-            KeyEvent {
-                modifiers: KeyModifiers::CONTROL,
-                code,
-                ..
-            } => {
-                println!("Control + {:?}", code);
-            }
-            KeyEvent {
-                modifiers: KeyModifiers::SHIFT,
-                code,
-                ..
-            } => {
-                println!("Shift + {:?}", code);
-            }
-            KeyEvent {
-                modifiers: KeyModifiers::ALT,
-                code,
-                ..
-            } => {
-                println!("Alt + {:?}", code);
-            }
+fn match_event(read_event: Event) {
+    match read_event {
+        // Match one one modifier:
+        Event::Key(KeyEvent {
+            modifiers: KeyModifiers::CONTROL,
+            code,
+            ..
+        }) => {
+            println!("Control + {:?}", code);
+        }
+        Event::Key(KeyEvent {
+            modifiers: KeyModifiers::SHIFT,
+            code,
+            ..
+        }) => {
+            println!("Shift + {:?}", code);
+        }
+        Event::Key(KeyEvent {
+            modifiers: KeyModifiers::ALT,
+            code,
+            ..
+        }) => {
+            println!("Alt + {:?}", code);
+        }
 
-            // Match on multiple modifiers:
-            KeyEvent {
-                code, modifiers, ..
-            } => {
-                if modifiers == (KeyModifiers::ALT | KeyModifiers::SHIFT) {
-                    println!("Alt + Shift {:?}", code);
-                } else {
-                    println!("({:?}) with key: {:?}", modifiers, code)
-                }
+        // Match on multiple modifiers:
+        Event::Key(KeyEvent {
+            code, modifiers, ..
+        }) => {
+            if modifiers == (KeyModifiers::ALT | KeyModifiers::SHIFT) {
+                println!("Alt + Shift {:?}", code);
+            } else {
+                println!("({:?}) with key: {:?}", modifiers, code)
             }
         }
+
+        _ => {}
     }
 }
 

examples/event-match-modifiers.rs

@@ -7,9 +7,9 @@
 
 use std::io;
 
-use crossterm::event::KeyModifiers;
+use crossterm::event::{KeyEventKind, KeyModifiers};
 use crossterm::{
-    event::{read, KeyCode},
+    event::{read, Event, KeyCode},
     terminal::{disable_raw_mode, enable_raw_mode},
 };
 
@@ -29,17 +29,20 @@ fn main() -> io::Result<()> {
 }
 
 fn print_events() -> io::Result<()> {
-    while let Ok(event) = read() {
-        let Some(event) = event.as_key_press_event() else {
-            continue;
-        };
-        let modifier = match event.modifiers {
-            KeyModifiers::NONE => "".to_string(),
-            _ => format!("{:}+", event.modifiers),
-        };
-        println!("Key pressed: {modifier}{code}\r", code = event.code);
-        if event.code == KeyCode::Esc {
-            break;
+    loop {
+        let event = read()?;
+        match event {
+            Event::Key(event) if event.kind == KeyEventKind::Press => {
+                print!("Key pressed: ");
+                if event.modifiers != KeyModifiers::NONE {
+                    print!("{}+", event.modifiers);
+                }
+                println!("{}\r", event.code);
+                if event.code == KeyCode::Esc {
+                    break;
+                }
+            }
+            _ => {}
         }
     }
     Ok(())