From 78a39cecdbace3854291ab48dc03444434763508 Mon Sep 17 00:00:00 2001 From: rrr-marble Date: Sun, 27 Jun 2021 15:12:31 +0300 Subject: [PATCH] Revert "ref: use generic instead of Box for Pedal::action" This reverts commit 3199baab9c829189a2b5de4289177eaed4f7670b. --- src/main.rs | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 5ff3e31..93c283d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,27 +14,21 @@ fn main() -> () { let side_handle = std::thread::spawn(|| { let pedal = Pedal { key: evdev::Key::BTN_SIDE, - action: || println!("BTN_SIDE"), + action: Box::new(|| println!("BTN_SIDE")), }; loop { if D.get_key_state().unwrap().contains(pedal.key) { - (&pedal.action)(); + (*pedal.action)(); } std::thread::sleep(std::time::Duration::from_millis(100)); } }); - let extra_handle = std::thread::spawn(|| { - let pedal = Pedal { - key: evdev::Key::BTN_EXTRA, - action: || println!("BTN_EXTRA"), - }; - loop { - if D.get_key_state().unwrap().contains(pedal.key) { - (&pedal.action)(); - } - std::thread::sleep(std::time::Duration::from_millis(100)); + let extra_handle = std::thread::spawn(|| loop { + if D.get_key_state().unwrap().contains(evdev::Key::BTN_EXTRA) { + println!("BTN_EXTRA"); } + std::thread::sleep(std::time::Duration::from_millis(100)); }); extra_handle.join().expect("Couldn't join"); @@ -62,7 +56,7 @@ fn pick_device() -> evdev::Device { } } -struct Pedal ()> { +struct Pedal { key: evdev::Key, - action: F, + action: Box ()>, }