misc fixes

yewstack · Mar 31, 2021 · 53adbee · 53adbee
1 parent c9cf845
commit 53adbee
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/examples/router/src/pages/author.rs b/examples/router/src/pages/author.rs
@@ -12,7 +12,7 @@ impl Component for Author {
     fn create(_: Self::Properties, _link: ComponentLink<Self>) -> Self {
         let seed = match RouterService::current_route().route() {
             Routes::Author { id } => *id,
-            _ => unreachable!()
+            _ => unreachable!(),
         };
 
         Self {

diff --git a/examples/router/src/pages/post.rs b/examples/router/src/pages/post.rs
@@ -13,7 +13,7 @@ impl Component for Post {
     fn create(_: Self::Properties, _link: ComponentLink<Self>) -> Self {
         let seed = match RouterService::current_route().route() {
             Routes::Post { id } => *id,
-            _ => unreachable!()
+            _ => unreachable!(),
         };
 
         Self {

diff --git a/examples/router/src/pages/post_list.rs b/examples/router/src/pages/post_list.rs
@@ -1,8 +1,8 @@
 use crate::components::{pagination::Pagination, post_card::PostCard};
 use crate::Routes;
+use std::collections::HashMap;
 use yew::prelude::*;
 use yew_router::RouterService;
-use std::collections::HashMap;
 
 const ITEMS_PER_PAGE: u64 = 10;
 const TOTAL_PAGES: u64 = std::u64::MAX / ITEMS_PER_PAGE;

diff --git a/packages/yew-router/src/lib.rs b/packages/yew-router/src/lib.rs
@@ -56,9 +56,9 @@
 pub mod components;
 mod current_route;
 mod params;
+mod routable;
 pub mod router;
 mod service;
-mod routable;
 pub mod utils;
 
 pub use current_route::CurrentRoute;

diff --git a/packages/yew-router/tests/parser.rs b/packages/yew-router/tests/parser.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use wasm_bindgen::{JsCast, JsValue};
 use wasm_bindgen_test::wasm_bindgen_test as test;
 use yew::prelude::*;
 use yew::utils::*;
@@ -45,8 +44,8 @@ fn test_get_query_params() {
         Routes::Home,
         Some({
             let mut map = HashMap::new();
-            map.insert("foo", "bar");
-            map.insert("value", "test");
+            map.insert("foo", "bar".to_string());
+            map.insert("value", "test".to_string());
             map
         }),
     );

diff --git a/packages/yew-router/tests/router.rs b/packages/yew-router/tests/router.rs
@@ -41,7 +41,7 @@ fn component() -> Html {
             Routes::No { id: 2 },
             Some({
                 let mut map = HashMap::new();
-                map.insert("foo", "bar");
+                map.insert("foo", "bar".to_string());
                 map
             }),
         )