fix: clippy, format

Author: MartinKavik

examples/app_builder/src/lib.rs

@@ -1,10 +1,11 @@
-use seed::{*, prelude::*};
+use seed::{prelude::*, *};
 use web_sys;
 
 // ------ ------
 //     Model
 // ------ ------
 
+#[derive(Default)]
 struct Model {
     clicks: u32,
 }
@@ -27,11 +28,11 @@ fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>) {
         Msg::UrlChanged(url) => {
             log!(url);
             orders.skip();
-        },
+        }
         Msg::KeyPressed(event) => {
             log!(event.key());
             orders.skip();
-        },
+        }
         Msg::SayHello => {
             orders.send_g_msg(GMsg::SayHello);
         }
@@ -48,10 +49,7 @@ fn view(model: &Model) -> impl View<Msg> {
             format!("Clicked: {}", model.clicks),
             simple_ev(Ev::Click, Msg::Clicked),
         ],
-        button![
-            "Say hello",
-            simple_ev(Ev::Click, Msg::SayHello),
-        ]
+        button!["Say hello", simple_ev(Ev::Click, Msg::SayHello),],
     ]
 }
 
@@ -68,15 +66,14 @@ fn routes(url: Url) -> Option<Msg> {
 // ------ ------
 
 fn window_events(_model: &Model) -> Vec<Listener<Msg>> {
-    vec![
-        keyboard_ev(Ev::KeyDown, Msg::KeyPressed)
-    ]
+    vec![keyboard_ev(Ev::KeyDown, Msg::KeyPressed)]
 }
 
 // ------ ------
 //     Sink
 // ------ ------
 
+#[derive(Clone, Copy)]
 enum GMsg {
     SayHello,
 }
@@ -91,7 +88,7 @@ fn sink(g_msg: GMsg, _model: &mut Model, _orders: &mut impl Orders<Msg, GMsg>) {
 // Before Mount
 // ------ ------
 
-fn before_mount(_url: Url) -> BeforeMount {
+fn before_mount(_: Url) -> BeforeMount {
     BeforeMount::new()
         .mount_point("main")
         .mount_type(MountType::Takeover)
@@ -101,9 +98,8 @@ fn before_mount(_url: Url) -> BeforeMount {
 //  After Mount
 // ------ ------
 
-fn after_mount(_url: Url, _orders: &mut impl Orders<Msg, GMsg>) -> AfterMount<Model> {
-    AfterMount::new(Model { clicks: 0 })
-        .url_handling(UrlHandling::None)
+fn after_mount(_: Url, _orders: &mut impl Orders<Msg, GMsg>) -> AfterMount<Model> {
+    AfterMount::new(Model { clicks: 0 }).url_handling(UrlHandling::None)
 }
 
 // ------ ------

examples/drop/src/lib.rs

@@ -11,6 +11,15 @@ struct Model {
     drop_zone_content: Vec<Node<Msg>>,
 }
 
+//  After Mount
+
+fn after_mount(_: Url, _: &mut impl Orders<Msg>) -> AfterMount<Model> {
+    AfterMount::new(Model {
+        drop_zone_active: false,
+        drop_zone_content: vec![div!["Drop files here"]],
+    })
+}
+
 // Update
 
 #[derive(Clone, Debug)]
@@ -109,9 +118,6 @@ fn view(model: &Model) -> impl View<Msg> {
 #[wasm_bindgen(start)]
 pub fn start() {
     seed::App::builder(update, view)
-        .after_mount(AfterMount::new(Model {
-            drop_zone_active: false,
-            drop_zone_content: vec![div!["Drop files here"]],
-        }))
+        .after_mount(after_mount)
         .build_and_start();
 }

src/lib.rs

@@ -89,7 +89,7 @@ pub mod prelude {
         },
         events::{
             input_ev, keyboard_ev, mouse_ev, pointer_ev, raw_ev, simple_ev, trigger_update_handler,
-            Ev, Listener
+            Ev, Listener,
         },
         orders::Orders,
         routing::Url,

src/orders.rs

@@ -1,11 +1,11 @@
 use crate::dom_types::{MessageMapper, View};
-use crate::vdom::{App, Effect, RenderTimestampDelta, ShouldRender};
+use crate::vdom::{App, Effect, RenderTimestampDelta, ShouldRender, UndefinedGMsg};
 use futures::Future;
 use std::{collections::VecDeque, convert::identity, rc::Rc};
 
 // ------ Orders ------
 
-pub trait Orders<Ms: 'static, GMs = ()> {
+pub trait Orders<Ms: 'static, GMs = UndefinedGMsg> {
     type AppMs: 'static;
     type Mdl: 'static;
     type ElC: View<Self::AppMs> + 'static;
@@ -96,7 +96,7 @@ pub trait Orders<Ms: 'static, GMs = ()> {
 // ------ OrdersContainer ------
 
 #[allow(clippy::module_name_repetitions)]
-pub struct OrdersContainer<Ms: 'static, Mdl: 'static, ElC: View<Ms>, GMs = ()> {
+pub struct OrdersContainer<Ms: 'static, Mdl: 'static, ElC: View<Ms>, GMs = UndefinedGMsg> {
     pub(crate) should_render: ShouldRender,
     pub(crate) effects: VecDeque<Effect<Ms, GMs>>,
     app: App<Ms, Mdl, ElC, GMs>,
@@ -200,7 +200,14 @@ impl<Ms: 'static, Mdl, ElC: View<Ms> + 'static, GMs> Orders<Ms, GMs>
 // ------ OrdersProxy ------
 
 #[allow(clippy::module_name_repetitions)]
-pub struct OrdersProxy<'a, Ms, AppMs: 'static, Mdl: 'static, ElC: View<AppMs>, GMs: 'static = ()> {
+pub struct OrdersProxy<
+    'a,
+    Ms,
+    AppMs: 'static,
+    Mdl: 'static,
+    ElC: View<AppMs>,
+    GMs: 'static = UndefinedGMsg,
+> {
     orders_container: &'a mut OrdersContainer<AppMs, Mdl, ElC, GMs>,
     f: Rc<dyn Fn(Ms) -> AppMs>,
 }

src/vdom.rs

@@ -20,7 +20,7 @@ pub use alias::*;
 pub mod builder;
 pub use builder::{
     AfterMount, BeforeMount, Builder as AppBuilder, Init, InitFn, MountPoint, MountType,
-    UrlHandling, UndefinedInitAPI, UndefinedMountPoint
+    UndefinedInitAPI, UndefinedMountPoint, UrlHandling,
 };
 
 use crate::{
@@ -177,8 +177,13 @@ impl<Ms: 'static, Mdl: 'static, ElC: View<Ms>, GMs> ::std::fmt::Debug for App<Ms
 }
 
 #[deprecated(since = "0.5.0", note = "Part of the old Init API.")]
-type InitAppBuilder<Ms, Mdl, ElC, GMs> =
-    AppBuilder<Ms, Mdl, ElC, GMs, builder::MountPointInitInitAPI<UndefinedMountPoint, InitFn<Ms, Mdl, ElC, GMs>>>;
+type InitAppBuilder<Ms, Mdl, ElC, GMs> = AppBuilder<
+    Ms,
+    Mdl,
+    ElC,
+    GMs,
+    builder::MountPointInitInitAPI<UndefinedMountPoint, InitFn<Ms, Mdl, ElC, GMs>>,
+>;
 
 /// We use a struct instead of series of functions, in order to avoid passing
 /// repetitive sequences of parameters.

src/vdom/builder.rs

@@ -175,7 +175,7 @@ impl<
 }
 // TODO Remove when removing the other `InitAPI`s.
 impl<Ms: 'static, Mdl: 'static + Default, ElC: 'static + View<Ms>, GMs: 'static>
-    InitAPI<Ms, Mdl, ElC, GMs> for UndefinedAfterMount
+    InitAPI<Ms, Mdl, ElC, GMs> for UndefinedInitAPI
 {
     type Builder = Builder<Ms, Mdl, ElC, GMs, Self>;
     fn build(builder: Self::Builder) -> App<Ms, Mdl, ElC, GMs> {
@@ -461,7 +461,7 @@ impl<
 
     pub fn after_mount<NewIAM: 'static + IntoAfterMount<Ms, Mdl, ElC, GMs>>(
         self,
-        new_after_mount: NewIAM,
+        after_mount: NewIAM,
     ) -> Builder<Ms, Mdl, ElC, GMs, BeforeAfterInitAPI<NewIAM>> {
         Builder {
             update: self.update,
@@ -471,7 +471,7 @@ impl<
             window_events: self.window_events,
             sink: self.sink,
 
-            init_api: self.init_api.after_mount(new_after_mount),
+            init_api: self.init_api.after_mount(after_mount),
         }
     }
 
@@ -482,8 +482,8 @@ impl<
     }
 
     /// Registers a function which decides how window events will be handled.
-    pub fn window_events(mut self, evts: WindowEvents<Ms, Mdl>) -> Self {
-        self.window_events = Some(evts);
+    pub fn window_events(mut self, window_events: WindowEvents<Ms, Mdl>) -> Self {
+        self.window_events = Some(window_events);
         self
     }
 

src/vdom/builder/after_mount.rs

@@ -1,5 +1,6 @@
 use crate::{dom_types::View, orders::OrdersContainer, routing::Url};
 
+#[allow(clippy::module_name_repetitions)]
 pub struct UndefinedAfterMount;
 
 // ------ UrlHandling ------
@@ -76,7 +77,9 @@ where
     }
 }
 
-impl<Ms: 'static, Mdl: Default, ElC: View<Ms>, GMs> IntoAfterMount<Ms, Mdl, ElC, GMs> for UndefinedAfterMount {
+impl<Ms: 'static, Mdl: Default, ElC: View<Ms>, GMs> IntoAfterMount<Ms, Mdl, ElC, GMs>
+    for UndefinedAfterMount
+{
     fn into_after_mount(
         self: Box<Self>,
         _: Url,

src/vdom/builder/before_mount.rs

@@ -11,13 +11,15 @@ pub trait MountPoint {
 impl MountPoint for &str {
     fn element_getter(self) -> Box<dyn FnOnce() -> Element> {
         let id = self.to_owned();
-        Box::new(move || util::document().get_element_by_id(&id).unwrap_or_else(|| {
-            panic!(
-                "Can't find element with id={:?} - app cannot be mounted!\n\
-                 (Id defaults to \"app\", or can be set with the .mount() method)",
-                id
-            )
-        }))
+        Box::new(move || {
+            util::document().get_element_by_id(&id).unwrap_or_else(|| {
+                panic!(
+                    "Can't find element with id={:?} - app cannot be mounted!\n\
+                     (Id defaults to \"app\", or can be set with the .mount() method)",
+                    id
+                )
+            })
+        })
     }
 }
 
@@ -74,7 +76,7 @@ impl BeforeMount {
         self
     }
 
-    pub fn mount_type(mut self, mount_type: MountType) -> Self {
+    pub const fn mount_type(mut self, mount_type: MountType) -> Self {
         self.mount_type = mount_type;
         self
     }