diff --git a/src/chord.rs b/src/chord.rs index 5e0da45..e72f76a 100644 --- a/src/chord.rs +++ b/src/chord.rs @@ -1,5 +1,7 @@ use bevy::{ - input::keyboard::KeyCode, prelude::{Deref, DerefMut, Resource}, reflect::{Enum, Reflect} + input::keyboard::KeyCode, + prelude::{Deref, DerefMut, Resource}, + reflect::{Enum, Reflect}, }; use std::{collections::VecDeque, fmt}; diff --git a/src/lib.rs b/src/lib.rs index 6cf22a5..e67b258 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,7 +12,7 @@ mod plugin; mod time_limit; pub use chord::{KeyChord, KeyChordQueue}; -pub use plugin::{InputSequencePlugin}; +pub use plugin::InputSequencePlugin; pub use time_limit::TimeLimit; pub use keyseq::{ @@ -22,9 +22,9 @@ pub use keyseq::{ /// Convenient glob import pub mod prelude { + pub use super::cond_system::IntoCondSystem; pub use super::input_sequence::{ButtonSequence, InputSequence, KeySequence}; pub use super::{action, keyseq, InputSequencePlugin, Modifiers, TimeLimit}; - pub use super::{KeyChordQueue, KeyChord}; - pub use super::cond_system::IntoCondSystem; + pub use super::{KeyChord, KeyChordQueue}; pub use std::time::Duration; } diff --git a/src/plugin.rs b/src/plugin.rs index 510bd5c..7672758 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -20,7 +20,7 @@ use std::collections::{HashMap, VecDeque}; use crate::{ cache::InputSequenceCache, - chord::{KeyChordQueue, is_modifier}, + chord::{is_modifier, KeyChordQueue}, frame_time::FrameTime, input_sequence::{ButtonSequence, InputSequence, KeySequence}, KeyChord, Modifiers, @@ -242,15 +242,17 @@ fn key_sequence_matcher( time: time.elapsed_seconds(), }; let maybe_start = last_times.front().cloned(); - let mut input = keychord_queue.drain(..).chain( - keys - .get_just_pressed() - .filter(|k| !is_modifier(**k)) - .map(|k| { - let chord = KeyChord(mods, *k); - last_times.push_back(now.clone()); - chord - })) + let mut input = keychord_queue + .drain(..) + .chain( + keys.get_just_pressed() + .filter(|k| !is_modifier(**k)) + .map(|k| { + let chord = KeyChord(mods, *k); + last_times.push_back(now.clone()); + chord + }), + ) .peekable(); if input.peek().is_none() { return; diff --git a/tests/simulated.rs b/tests/simulated.rs index bd8efa3..c32f321 100644 --- a/tests/simulated.rs +++ b/tests/simulated.rs @@ -30,7 +30,7 @@ mod simulate_app { keyboard::KeyCode, Axis, ButtonInput as Input, }, - prelude::{Resource, Commands, ResMut}, + prelude::{Commands, ResMut, Resource}, MinimalPlugins, }; use bevy_input_sequence::prelude::*; @@ -261,18 +261,12 @@ mod simulate_app { fn match_a_and_c() { let mut app = new_app(); - app.world_mut().add(KeySequence::new( - set(1), - [KeyCode::KeyA], - )); - app.world_mut().add(KeySequence::new( - set(2), - [KeyCode::KeyA, KeyCode::KeyB], - )); - app.world_mut().add(KeySequence::new( - set(3), - [KeyCode::KeyC], - )); + app.world_mut() + .add(KeySequence::new(set(1), [KeyCode::KeyA])); + app.world_mut() + .add(KeySequence::new(set(2), [KeyCode::KeyA, KeyCode::KeyB])); + app.world_mut() + .add(KeySequence::new(set(3), [KeyCode::KeyC])); assert_eq!(get(app.world()), 0); press_key(&mut app, KeyCode::KeyA); app.update();