From d2ec27e761ce55d8692e1ebbc5551e91cf568680 Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Wed, 26 Jul 2023 11:29:34 -0700
Subject: [PATCH] fix clippy

---
 packages/fullstack/src/router.rs       | 8 ++------
 packages/router/src/components/link.rs | 2 +-
 packages/router/src/contexts/router.rs | 6 ++++--
 packages/router/src/history/mod.rs     | 1 -
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/fullstack/src/router.rs b/packages/fullstack/src/router.rs
index 8eb7ef536..eee282c01 100644
--- a/packages/fullstack/src/router.rs
+++ b/packages/fullstack/src/router.rs
@@ -49,11 +49,7 @@ where
     }
 }
 
-fn default_external_navigation_handler<R>() -> fn(Scope) -> Element
-where
-    R: dioxus_router::prelude::Routable,
-    <R as std::str::FromStr>::Err: std::fmt::Display,
-{
+fn default_external_navigation_handler() -> fn(Scope) -> Element {
     dioxus_router::prelude::FailureExternalNavigation
 }
 
@@ -65,7 +61,7 @@ where
     <R as std::str::FromStr>::Err: std::fmt::Display,
 {
     #[serde(skip)]
-    #[serde(default = "default_external_navigation_handler::<R>")]
+    #[serde(default = "default_external_navigation_handler")]
     failure_external_navigation: fn(Scope) -> Element,
     scroll_restoration: bool,
     #[serde(skip)]
diff --git a/packages/router/src/components/link.rs b/packages/router/src/components/link.rs
index eb53c9547..15784016d 100644
--- a/packages/router/src/components/link.rs
+++ b/packages/router/src/components/link.rs
@@ -198,7 +198,7 @@ pub fn Link<'a>(cx: Scope<'a, LinkProps<'a>>) -> Element {
         IntoRoutable::Route(route) => router.any_route_to_string(&**route),
     };
     let parsed_route: NavigationTarget<Box<dyn Any>> = match router.route_from_str(&href) {
-        Ok(route) => NavigationTarget::Internal(route.into()),
+        Ok(route) => NavigationTarget::Internal(route),
         Err(err) => NavigationTarget::External(err),
     };
     let ac = active_class
diff --git a/packages/router/src/contexts/router.rs b/packages/router/src/contexts/router.rs
index f0e67fff8..89008b0dd 100644
--- a/packages/router/src/contexts/router.rs
+++ b/packages/router/src/contexts/router.rs
@@ -19,6 +19,8 @@ pub struct ExternalNavigationFailure(String);
 
 /// A function the router will call after every routing update.
 pub(crate) type RoutingCallback<R> = Arc<dyn Fn(LinkContext<R>) -> Option<NavigationTarget<R>>>;
+pub(crate) type AnyRoutingCallback =
+    Arc<dyn Fn(RouterContext) -> Option<NavigationTarget<Box<dyn Any>>>>;
 
 struct MutableRouterState {
     /// The current prefix.
@@ -36,7 +38,7 @@ pub struct RouterContext {
 
     subscribers: Arc<RwLock<HashSet<ScopeId>>>,
     subscriber_update: Arc<dyn Fn(ScopeId)>,
-    routing_callback: Option<Arc<dyn Fn(RouterContext) -> Option<NavigationTarget<Box<dyn Any>>>>>,
+    routing_callback: Option<AnyRoutingCallback>,
 
     failure_external_navigation: fn(Scope) -> Element,
 
@@ -250,7 +252,7 @@ impl RouterContext {
             IntoRoutable::Route(route) => self.any_route_to_string(&**route),
         };
         let parsed_route: NavigationTarget<Box<dyn Any>> = match self.route_from_str(&href) {
-            Ok(route) => NavigationTarget::Internal(route.into()),
+            Ok(route) => NavigationTarget::Internal(route),
             Err(err) => NavigationTarget::External(err),
         };
         parsed_route
diff --git a/packages/router/src/history/mod.rs b/packages/router/src/history/mod.rs
index 961a4bd96..4c5b2a3e9 100644
--- a/packages/router/src/history/mod.rs
+++ b/packages/router/src/history/mod.rs
@@ -279,7 +279,6 @@ pub trait HistoryProvider<R: Routable> {
 }
 
 pub(crate) trait AnyHistoryProvider {
-    #[must_use]
     fn parse_route(&self, route: &str) -> Result<Box<dyn Any>, String>;
 
     #[must_use]