update Justfile and fix some warnings

input/src/command.rs

@@ -1,39 +1,4 @@
 use crate::*;
-pub trait Command<S>: Send + Sync + Sized {
-    fn execute (self, state: &mut S) -> Perhaps<Self>;
-    fn delegate <T> (self, state: &mut S, wrap: impl Fn(Self)->T) -> Perhaps<T> {
-        Ok(self.execute(state)?.map(wrap))
-    }
-}
-#[macro_export] macro_rules! input_to_command {
-    (<$($l:lifetime),+> $Command:ty: |$state:ident:$State:ty, $input:ident:$Input:ty| $handler:expr) => {
-        impl<$($l),+> InputToCommand<$Input, $State> for $Command {
-            fn input_to_command ($state: &$State, $input: &$Input) -> Option<Self> {
-                Some($handler)
-            }
-        }
-    };
-    ($Command:ty: |$state:ident:$State:ty, $input:ident:$Input:ty| $handler:expr) => {
-        impl InputToCommand<$Input, $State> for $Command {
-            fn input_to_command ($state: &$State, $input: &$Input) -> Option<Self> {
-                Some($handler)
-            }
-        }
-    }
-}
-
-pub trait InputToCommand<I, S>: Command<S> + Sized {
-    fn input_to_command (state: &S, input: &I) -> Option<Self>;
-    fn execute_with_state (state: &mut S, input: &I) -> Perhaps<bool> {
-        Ok(if let Some(command) = Self::input_to_command(state, input) {
-            let _undo = command.execute(state)?;
-            Some(true)
-        } else {
-            None
-        })
-    }
-}
-
 #[macro_export] macro_rules! command {
     ($(<$($l:lifetime),+>)?|$self:ident:$Command:ty,$state:ident:$State:ty|$handler:expr) => {
         impl$(<$($l),+>)? Command<$State> for $Command {
@@ -43,3 +8,9 @@ pub trait InputToCommand<I, S>: Command<S> + Sized {
         }
     };
 }
+pub trait Command<S>: Send + Sync + Sized {
+    fn execute (self, state: &mut S) -> Perhaps<Self>;
+    fn delegate <T> (self, state: &mut S, wrap: impl Fn(Self)->T) -> Perhaps<T> {
+        Ok(self.execute(state)?.map(wrap))
+    }
+}

input/src/engine.rs

@@ -1,5 +1,3 @@
-use crate::*;
-
 /// Event source
 pub trait Input: Send + Sync + Sized {
     /// Type of input event

input/src/event_map.rs

@@ -1,9 +1,8 @@
-use crate::*;
-
 pub struct EventMap<'a, S, I: PartialEq, C> {
     pub bindings: &'a [(I, &'a dyn Fn(&S) -> Option<C>)],
     pub fallback: Option<&'a dyn Fn(&S, &I) -> Option<C>>
 }
+
 impl<'a, S, I: PartialEq, C> EventMap<'a, S, I, C> {
     pub fn handle (&self, state: &S, input: &I) -> Option<C> {
         for (binding, handler) in self.bindings.iter() {

input/src/input.rs

@@ -0,0 +1,30 @@
+use crate::*;
+#[macro_export] macro_rules! input_to_command {
+    (<$($l:lifetime),+> $Command:ty: |$state:ident:$State:ty, $input:ident:$Input:ty| $handler:expr) => {
+        impl<$($l),+> InputToCommand<$Input, $State> for $Command {
+            fn input_to_command ($state: &$State, $input: &$Input) -> Option<Self> {
+                Some($handler)
+            }
+        }
+    };
+    ($Command:ty: |$state:ident:$State:ty, $input:ident:$Input:ty| $handler:expr) => {
+        impl InputToCommand<$Input, $State> for $Command {
+            fn input_to_command ($state: &$State, $input: &$Input) -> Option<Self> {
+                Some($handler)
+            }
+        }
+    }
+}
+
+pub trait InputToCommand<I, S>: Command<S> + Sized {
+    fn input_to_command (state: &S, input: &I) -> Option<Self>;
+    fn execute_with_state (state: &mut S, input: &I) -> Perhaps<bool> {
+        Ok(if let Some(command) = Self::input_to_command(state, input) {
+            let _undo = command.execute(state)?;
+            Some(true)
+        } else {
+            None
+        })
+    }
+}
+

input/src/lib.rs

@@ -1,9 +1,10 @@
 #![feature(associated_type_defaults)]
 
 //mod component; pub use self::component::*;
-mod engine; pub use self::engine::*;
-mod handle; pub use self::handle::*;
-mod command; pub use self::command::*;
+mod engine;    pub use self::engine::*;
+mod input;     pub use self::input::*;
+mod handle;    pub use self::handle::*;
+mod command;   pub use self::command::*;
 mod event_map; pub use self::event_map::*;
 
 pub(crate) use std::marker::PhantomData;