From 81a517b264912f65fd9a216befd5dd788d93adf4 Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Thu, 25 Mar 2021 14:13:59 +0000 Subject: [PATCH] Remove a dead input enum variant --- src/common/mod.rs | 34 +++++++++++++++++----------------- src/common/wasm_vm.rs | 1 - 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/common/mod.rs b/src/common/mod.rs index b8a4c671..add50d47 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -593,25 +593,25 @@ pub fn start(mut os_input: Box, opts: CliArgs) { } // FIXME: Deduplicate this with the callback below! PluginInstruction::Input(input_type, input_bytes) => { - if let PluginInputType::Event(event) = input_type { - for (instance, plugin_env) in plugin_map.values() { - if !plugin_env.events.contains(&event) { - continue; - } - let handle_key = instance - .exports - .get_function(handler_map.get(&event).unwrap()) - .unwrap(); - for key in input_bytes.keys().flatten() { - let key = cast_termion_key(key); - wasi_write_string( - &plugin_env.wasi_env, - &serde_json::to_string(&key).unwrap(), - ); - handle_key.call(&[]).unwrap(); - } + let PluginInputType::Event(event) = input_type; + for (instance, plugin_env) in plugin_map.values() { + if !plugin_env.events.contains(&event) { + continue; + } + let handle_key = instance + .exports + .get_function(handler_map.get(&event).unwrap()) + .unwrap(); + for key in input_bytes.keys().flatten() { + let key = cast_termion_key(key); + wasi_write_string( + &plugin_env.wasi_env, + &serde_json::to_string(&key).unwrap(), + ); + handle_key.call(&[]).unwrap(); } } + drop(send_screen_instructions.send(ScreenInstruction::Render)); } PluginInstruction::Unload(pid) => drop(plugin_map.remove(&pid)), diff --git a/src/common/wasm_vm.rs b/src/common/wasm_vm.rs index 24b947d6..19b3a197 100644 --- a/src/common/wasm_vm.rs +++ b/src/common/wasm_vm.rs @@ -23,7 +23,6 @@ pub enum NaughtyEventType { #[derive(Clone, Debug)] pub enum PluginInputType { - Normal(u32), Event(NaughtyEventType), }