From 4677a00adc37dca323aa70acb50d9f68d3ab0b54 Mon Sep 17 00:00:00 2001
From: Adrian Wannenmacher <tfld@tfld.dev>
Date: Tue, 13 Dec 2022 16:19:40 +0100
Subject: [PATCH] apply clippy suggestions

---
 packages/router-core/src/routes/segment.rs        | 4 ++--
 packages/router-core/src/service.rs               | 4 ++--
 packages/router-core/src/state.rs                 | 2 +-
 packages/router-core/src/utils/name.rs            | 4 ++--
 packages/router-core/src/utils/target.rs          | 6 +++---
 packages/router/src/components/default_errors.rs  | 2 +-
 packages/router/src/components/history_buttons.rs | 4 ++--
 packages/router/src/components/link.rs            | 2 +-
 packages/router/src/components/outlet.rs          | 2 +-
 packages/router/src/hooks/use_navigate.rs         | 1 -
 packages/router/src/hooks/use_route.rs            | 5 +----
 packages/router/src/hooks/use_router.rs           | 2 +-
 packages/router/src/utils/use_router_internal.rs  | 2 +-
 13 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/packages/router-core/src/routes/segment.rs b/packages/router-core/src/routes/segment.rs
index 445ec07f8..bcc1fbc4e 100644
--- a/packages/router-core/src/routes/segment.rs
+++ b/packages/router-core/src/routes/segment.rs
@@ -189,7 +189,7 @@ impl<T: Clone> Segment<T> {
     pub fn gen_sitemap(&self) -> Vec<String> {
         let mut res = Vec::new();
         res.push(String::from("/"));
-        gen_sitemap(&self, "", &mut res);
+        gen_sitemap(self, "", &mut res);
         res
     }
 
@@ -213,7 +213,7 @@ impl<T: Clone> Segment<T> {
     pub fn gen_parameter_sitemap(&self, parameters: &BTreeMap<Name, Vec<String>>) -> Vec<String> {
         let mut res = Vec::new();
         res.push(String::from("/"));
-        gen_parameter_sitemap(&self, parameters, "", &mut res);
+        gen_parameter_sitemap(self, parameters, "", &mut res);
         res
     }
 }
diff --git a/packages/router-core/src/service.rs b/packages/router-core/src/service.rs
index 2bde83ffe..8cdebb641 100644
--- a/packages/router-core/src/service.rs
+++ b/packages/router-core/src/service.rs
@@ -146,7 +146,7 @@ where
         (
             Self {
                 history,
-                names: names,
+                names,
                 routes,
                 receiver,
                 state: Arc::clone(&state),
@@ -444,7 +444,7 @@ where
                     false
                 } else {
                     (self.subscriber_update)(id.as_ref().clone());
-                    previous.push(id.clone());
+                    previous.push(id);
                     true
                 }
             } else {
diff --git a/packages/router-core/src/state.rs b/packages/router-core/src/state.rs
index 67af9e829..841a5994b 100644
--- a/packages/router-core/src/state.rs
+++ b/packages/router-core/src/state.rs
@@ -65,7 +65,7 @@ impl<T: Clone> RouterState<T> {
 
     /// Get the `href` for the `target`.
     pub fn href(&self, target: &NavigationTarget) -> String {
-        match resolve_target(&self.name_map, &target) {
+        match resolve_target(&self.name_map, target) {
             Either::Left(Either::Left(i)) => match &self.prefix {
                 Some(p) => format!("{p}{i}"),
                 None => i,
diff --git a/packages/router-core/src/utils/name.rs b/packages/router-core/src/utils/name.rs
index 7d08d347a..3aa43b368 100644
--- a/packages/router-core/src/utils/name.rs
+++ b/packages/router-core/src/utils/name.rs
@@ -13,10 +13,10 @@ pub fn resolve_name(
     parameters: &HashMap<Name, String>,
 ) -> Option<String> {
     debug_assert!(
-        map.contains_key(&name),
+        map.contains_key(name),
         "named navigation to unknown name: {name}"
     );
-    let target = map.get(&name)?;
+    let target = map.get(name)?;
 
     let mut res = String::new();
     for t in target {
diff --git a/packages/router-core/src/utils/target.rs b/packages/router-core/src/utils/target.rs
index 7c3ef2117..a41001d38 100644
--- a/packages/router-core/src/utils/target.rs
+++ b/packages/router-core/src/utils/target.rs
@@ -27,7 +27,7 @@ pub fn resolve_target(
                                 if !s.starts_with('?') {
                                     p += "?";
                                 }
-                                p += &s;
+                                p += s;
                             }
                             #[cfg(feature = "serde")]
                             Query::List(l) => {
@@ -44,8 +44,8 @@ pub fn resolve_target(
 
                     p
                 })
-                .map(|p| Either::Left(p))
-                .unwrap_or(Either::Right(name.clone())),
+                .map(Either::Left)
+                .unwrap_or_else(|| Either::Right(name.clone())),
         ),
         NavigationTarget::External(e) => Either::Right(e.to_string()),
     }
diff --git a/packages/router/src/components/default_errors.rs b/packages/router/src/components/default_errors.rs
index 2dbe9ed99..416f34589 100644
--- a/packages/router/src/components/default_errors.rs
+++ b/packages/router/src/components/default_errors.rs
@@ -4,7 +4,7 @@ use dioxus_router_core::prelude::{named, FailureExternalNavigation as FENName, R
 
 #[allow(non_snake_case)]
 pub fn FailureExternalNavigation(cx: Scope) -> Element {
-    let state = use_route(&cx).expect(
+    let state = use_route(cx).expect(
         "`FailureExternalNavigation` can only be mounted by the router itself, \
             since it is not exposed",
     );
diff --git a/packages/router/src/components/history_buttons.rs b/packages/router/src/components/history_buttons.rs
index 979ecd2b1..2475ecbad 100644
--- a/packages/router/src/components/history_buttons.rs
+++ b/packages/router/src/components/history_buttons.rs
@@ -56,7 +56,7 @@ pub fn GoBackButton<'a>(cx: Scope<'a, HistoryButtonProps<'a>>) -> Element {
     let HistoryButtonProps { children } = cx.props;
 
     // hook up to router
-    let router = match use_router_internal(&cx) {
+    let router = match use_router_internal(cx) {
         Some(r) => r,
         #[allow(unreachable_code)]
         None => {
@@ -131,7 +131,7 @@ pub fn GoForwardButton<'a>(cx: Scope<'a, HistoryButtonProps<'a>>) -> Element {
     let HistoryButtonProps { children } = cx.props;
 
     // hook up to router
-    let router = match use_router_internal(&cx) {
+    let router = match use_router_internal(cx) {
         Some(r) => r,
         #[allow(unreachable_code)]
         None => {
diff --git a/packages/router/src/components/link.rs b/packages/router/src/components/link.rs
index c146855c5..2b4a0faf6 100644
--- a/packages/router/src/components/link.rs
+++ b/packages/router/src/components/link.rs
@@ -114,7 +114,7 @@ pub fn Link<'a>(cx: Scope<'a, LinkProps<'a>>) -> Element {
     } = cx.props;
 
     // hook up to router
-    let router = match use_router_internal(&cx) {
+    let router = match use_router_internal(cx) {
         Some(r) => r,
         #[allow(unreachable_code)]
         None => {
diff --git a/packages/router/src/components/outlet.rs b/packages/router/src/components/outlet.rs
index b4aa47e58..914a1eb04 100644
--- a/packages/router/src/components/outlet.rs
+++ b/packages/router/src/components/outlet.rs
@@ -69,7 +69,7 @@ pub fn Outlet(cx: Scope<OutletProps>) -> Element {
     let OutletProps { depth, name } = cx.props;
 
     // hook up to router
-    let router = match use_router_internal(&cx) {
+    let router = match use_router_internal(cx) {
         Some(r) => r,
         #[allow(unreachable_code)]
         None => {
diff --git a/packages/router/src/hooks/use_navigate.rs b/packages/router/src/hooks/use_navigate.rs
index 0551abd6f..3b9b2f130 100644
--- a/packages/router/src/hooks/use_navigate.rs
+++ b/packages/router/src/hooks/use_navigate.rs
@@ -58,7 +58,6 @@ use crate::{RouterError, utils::use_router_internal::use_router_internal};
 /// # let _ = vdom.rebuild();
 /// # assert_eq!(dioxus_ssr::render(&vdom), "<h1>App</h1><p>Content</p>");
 /// ```
-#[must_use]
 pub fn use_navigate(cx: &ScopeState) -> Result<Navigator<ScopeId>, RouterError> {
     match use_router_internal(cx) {
         Some(r) => Ok(r.sender.clone().into()),
diff --git a/packages/router/src/hooks/use_route.rs b/packages/router/src/hooks/use_route.rs
index b1de258b7..9f802e788 100644
--- a/packages/router/src/hooks/use_route.rs
+++ b/packages/router/src/hooks/use_route.rs
@@ -56,10 +56,7 @@ use crate::{utils::use_router_internal::use_router_internal, RouterError};
 /// ```
 ///
 /// [`use_router`]: crate::hooks::use_router
-#[must_use]
-pub fn use_route<'a>(
-    cx: &'a ScopeState,
-) -> Result<RwLockReadGuard<'a, RouterState<Component>>, RouterError> {
+pub fn use_route(cx: &ScopeState) -> Result<RwLockReadGuard<RouterState<Component>>, RouterError> {
     match use_router_internal(cx) {
         Some(r) => loop {
             if let Some(s) = r.state.try_read() {
diff --git a/packages/router/src/hooks/use_router.rs b/packages/router/src/hooks/use_router.rs
index 1a5957cf5..667b7b63d 100644
--- a/packages/router/src/hooks/use_router.rs
+++ b/packages/router/src/hooks/use_router.rs
@@ -192,7 +192,7 @@ impl Default for RouterConfiguration {
             failure_external_navigation: comp(FailureExternalNavigation),
             failure_named_navigation: comp(FailureNamedNavigation),
             failure_redirection_limit: comp(FailureRedirectionLimit),
-            history: Box::new(MemoryHistory::default()),
+            history: Box::<MemoryHistory>::default(),
             on_update: None,
             synchronous: false,
         }
diff --git a/packages/router/src/utils/use_router_internal.rs b/packages/router/src/utils/use_router_internal.rs
index 2e6ec829b..0bee3406d 100644
--- a/packages/router/src/utils/use_router_internal.rs
+++ b/packages/router/src/utils/use_router_internal.rs
@@ -15,7 +15,7 @@ use crate::contexts::router::RouterContext;
 /// - Otherwise [`Some`].
 ///
 /// [`use_router`]: crate::hooks::use_router
-pub(crate) fn use_router_internal<'a>(cx: &'a ScopeState) -> &'a mut Option<RouterContext> {
+pub(crate) fn use_router_internal(cx: &ScopeState) -> &mut Option<RouterContext> {
     let id = cx.use_hook(|| Arc::new(cx.scope_id()));
 
     cx.use_hook(|| {