Format code

Author: johan-smits

atomic_hooks/macro/src/lib.rs

@@ -1,52 +1,39 @@
-
-use seed::prelude::*;
 use crate::state_access::StateAccess;
 use atomic_hooks::atom::Atom;
-
+use seed::prelude::*;
 
 pub trait StateAccessEventHandlers<T>
 where
     T: 'static,
 {
-    fn input_ev<F: FnOnce(&mut T, String) -> () + 'static + Clone,Ms : 'static,>(
+    fn input_ev<F: FnOnce(&mut T, String) -> () + 'static + Clone, Ms: 'static>(
         &self,
         event: Ev,
         func: F,
     ) -> seed::EventHandler<Ms>;
 
-    fn mouse_ev<
-        F: FnOnce(&mut T, web_sys::MouseEvent) -> () + 'static + Clone,
-        Ms : 'static,
-    >(
+    fn mouse_ev<F: FnOnce(&mut T, web_sys::MouseEvent) -> () + 'static + Clone, Ms: 'static>(
         &self,
         event: Ev,
         func: F,
     ) -> seed::EventHandler<Ms>;
 
-  
-    fn on_click<
-        F: FnOnce(&mut T) -> () + 'static + Clone,
-        Ms : 'static,
-    >(
+    fn on_click<F: FnOnce(&mut T) -> () + 'static + Clone, Ms: 'static>(
         &self,
         func: F,
     ) -> seed::EventHandler<Ms>;
 
-        fn on_input<
-        F: FnOnce(&mut T, String) -> () + 'static + Clone,
-        Ms : 'static,
-    >(
+    fn on_input<F: FnOnce(&mut T, String) -> () + 'static + Clone, Ms: 'static>(
         &self,
         func: F,
     ) -> seed::EventHandler<Ms>;
-
 }
 
 impl<T> StateAccessEventHandlers<T> for StateAccess<T>
 where
     T: 'static,
 {
-    fn input_ev<F: FnOnce(&mut T, String) -> () + 'static + Clone ,Ms : 'static,>(
+    fn input_ev<F: FnOnce(&mut T, String) -> () + 'static + Clone, Ms: 'static>(
         &self,
         event: Ev,
         func: F,
@@ -57,55 +44,43 @@ where
         })
     }
 
-    fn mouse_ev<
-        F: FnOnce(&mut T, web_sys::MouseEvent) -> () + 'static + Clone,
-     Ms : 'static,
-    >(
+    fn mouse_ev<F: FnOnce(&mut T, web_sys::MouseEvent) -> () + 'static + Clone, Ms: 'static>(
         &self,
         event: Ev,
         func: F,
     ) -> seed::EventHandler<Ms> {
         let accessor = *self;
         mouse_ev(event, move |m_ev| {
             accessor.update(|val| func(val, m_ev));
-    
         })
     }
 
-        fn on_click<
-        F: FnOnce(&mut T) -> () + 'static + Clone,
-        Ms : 'static,
-    >(
+    fn on_click<F: FnOnce(&mut T) -> () + 'static + Clone, Ms: 'static>(
         &self,
         func: F,
     ) -> seed::EventHandler<Ms> {
         let accessor = *self;
         mouse_ev(Ev::Click, move |_| {
             accessor.update(|val| func(val));
-    
         })
     }
 
-        fn on_input<F: FnOnce(&mut T, String) -> () + 'static + Clone ,Ms : 'static,>(
-            &self,
-            func: F,
-        ) -> seed::EventHandler<Ms> {
-            let accessor = *self;
-            input_ev(Ev::Input, move |text| {
-                accessor.update(|val| func(val, text));
-            })
-        }
-
-
+    fn on_input<F: FnOnce(&mut T, String) -> () + 'static + Clone, Ms: 'static>(
+        &self,
+        func: F,
+    ) -> seed::EventHandler<Ms> {
+        let accessor = *self;
+        input_ev(Ev::Input, move |text| {
+            accessor.update(|val| func(val, text));
+        })
+    }
 }
 
-
-
 impl<T> StateAccessEventHandlers<T> for Atom<T>
 where
     T: 'static,
 {
-    fn input_ev<F: FnOnce(&mut T, String) -> () + 'static + Clone ,Ms : 'static,>(
+    fn input_ev<F: FnOnce(&mut T, String) -> () + 'static + Clone, Ms: 'static>(
         &self,
         event: Ev,
         func: F,
@@ -116,44 +91,34 @@ where
         })
     }
 
-    fn mouse_ev<
-        F: FnOnce(&mut T, web_sys::MouseEvent) -> () + 'static + Clone,
-     Ms : 'static,
-    >(
+    fn mouse_ev<F: FnOnce(&mut T, web_sys::MouseEvent) -> () + 'static + Clone, Ms: 'static>(
         &self,
         event: Ev,
         func: F,
     ) -> seed::EventHandler<Ms> {
         let accessor = *self;
         mouse_ev(event, move |m_ev| {
             accessor.update(|val| func(val, m_ev));
-    
         })
     }
 
-        fn on_click<
-        F: FnOnce(&mut T) -> () + 'static + Clone,
-        Ms : 'static,
-    >(
+    fn on_click<F: FnOnce(&mut T) -> () + 'static + Clone, Ms: 'static>(
         &self,
         func: F,
     ) -> seed::EventHandler<Ms> {
         let accessor = *self;
         mouse_ev(Ev::Click, move |_| {
             accessor.update(|val| func(val));
-    
         })
     }
 
-        fn on_input<F: FnOnce(&mut T, String) -> () + 'static + Clone ,Ms : 'static,>(
-            &self,
-            func: F,
-        ) -> seed::EventHandler<Ms> {
-            let accessor = *self;
-            input_ev(Ev::Input, move |text| {
-                accessor.update(|val| func(val, text));
-            })
-        }
-
-
+    fn on_input<F: FnOnce(&mut T, String) -> () + 'static + Clone, Ms: 'static>(
+        &self,
+        func: F,
+    ) -> seed::EventHandler<Ms> {
+        let accessor = *self;
+        input_ev(Ev::Input, move |text| {
+            accessor.update(|val| func(val, text));
+        })
+    }
 }

seed_hooks/src/ev_handlers.rs

@@ -1,18 +1,19 @@
 mod ev_handlers;
 
-
+mod reactive_enhancements;
 mod seed_bind;
 mod update_el;
 mod utils;
-mod reactive_enhancements;
 pub use ev_handlers::StateAccessEventHandlers;
-pub use seed_bind::{UpdateElLocal, InputBind};
-pub use update_el::{StateAccessUpdateEl, LocalUpdateEl2};
+pub use reactive_enhancements::ReactiveEnhancements;
+pub use seed_bind::{InputBind, UpdateElLocal};
+pub use update_el::{LocalUpdateEl2, StateAccessUpdateEl};
 pub use utils::{
-    after_render, after_render_once, get_html_element_by_id, //handle_unmount,
+    after_render,
+    after_render_once,
+    get_html_element_by_id, //handle_unmount,
     request_animation_frame,
 };
-pub use reactive_enhancements::ReactiveEnhancements;
 
 pub use atomic_hooks::*;