chore: make clippy happy

ctron · Dec 19, 2023 · c9f353b · c9f353b
1 parent 0b80cfe
commit c9f353b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -34,7 +34,7 @@
 //! # use yew::prelude::*;
 //! # use yew_nested_router::prelude::*;
 //! # #[derive(Clone, Debug, PartialEq, Eq, Target)]
-//! # pub enum AppRoute { Index };
+//! # pub enum AppRoute { Index }
 //! # #[function_component(MyContent)] fn my_content() -> Html { html!() }
 //! #[function_component(MyApp)]
 //! pub fn my_app() -> Html {

diff --git a/src/router.rs b/src/router.rs
@@ -276,7 +276,7 @@ impl<T: Target> Router<T> {
             .split('/')
             .skip(1)
             // urldecode in the process
-            .map(|segment| urlencoding::decode(segment))
+            .map(urlencoding::decode)
             .collect();
 
         // get a path, or return none if we had an urldecode error
@@ -286,12 +286,7 @@ impl<T: Target> Router<T> {
         };
 
         // parse the path into a target
-        // log::debug!("Path: {path:?}");
-        let target = T::parse_path(&path);
-        // log::debug!("New target: {target:?}");
-
-        // done
-        target
+        T::parse_path(&path)
     }
 
     fn sync_context(&mut self, ctx: &Context<Self>) {

diff --git a/yew-nested-router-macros/src/lib.rs b/yew-nested-router-macros/src/lib.rs
@@ -67,6 +67,7 @@ fn nested_field<P>(
                 return (values, Some(field));
             }
         } else {
+            #[allow(clippy::collapsible_else_if)]
             if opts.nested.is_present() {
                 panic!(
                     "Only the last field can be a nested target: {}",
@@ -148,14 +149,14 @@ fn render_path(data: &DataEnum) -> impl Iterator<Item = TokenStream> + '_ {
 }
 
 /// generate iterators for capturing and rendering values
-fn capture_values<'f, P, F>(
+fn capture_values<P, F>(
     expect_target: bool,
-    fields: &'f Punctuated<Field, P>,
+    fields: &Punctuated<Field, P>,
     skip_nested: TokenStream,
     push: F,
 ) -> (
-    impl Iterator<Item = TokenStream> + 'f,
-    impl Iterator<Item = TokenStream> + 'f,
+    impl Iterator<Item = TokenStream> + '_,
+    impl Iterator<Item = TokenStream> + '_,
 )
 where
     F: Fn(&Ident) -> TokenStream + 'static,
@@ -188,7 +189,7 @@ fn render_self(data: &DataEnum) -> impl Iterator<Item = TokenStream> + '_ {
         let name = &v.ident;
 
         let opts = Opts::from_variant(v).expect("Unable to parse options");
-        let disc = to_discriminator(&v, &opts);
+        let disc = to_discriminator(v, &opts);
 
         match &v.fields {
             // plain route
@@ -235,7 +236,7 @@ fn parse_path(data: &DataEnum) -> impl Iterator<Item = TokenStream> + '_ {
         let name = &v.ident;
 
         let opts = Opts::from_variant(v).expect("Unable to parse options");
-        let value = to_discriminator(&v, &opts);
+        let value = to_discriminator(v, &opts);
 
         match &v.fields {
             Fields::Unit => {
@@ -244,20 +245,20 @@ fn parse_path(data: &DataEnum) -> impl Iterator<Item = TokenStream> + '_ {
                 }
             }
             Fields::Unnamed(fields) => parse_rules(
-                &v,
+                v,
                 true,
                 &fields.unnamed,
-                |_, cap| from_str(&cap),
+                |_, cap| from_str(cap),
                 |_, target| quote!(#target),
                 |name, values, target| quote!(Some(Self::#name(#(#values, )* #target))),
             ),
             Fields::Named(fields) => parse_rules(
-                &v,
+                v,
                 false,
                 &fields.named,
                 |name, cap| {
                     let name = name.expect("Must have a name");
-                    let from = from_str(&cap);
+                    let from = from_str(cap);
                     quote!(#name: #from)
                 },
                 |name, target| {
@@ -288,7 +289,7 @@ where
     let (values, nested) = nested_field(expect_target, fields);
 
     let opts = Opts::from_variant(v).expect("Unable to parse options");
-    let disc = to_discriminator(&v, &opts);
+    let disc = to_discriminator(v, &opts);
 
     let (captures, values): (Vec<_>, Vec<_>) = values
         .iter()
@@ -308,7 +309,7 @@ where
         Some(nested) => {
             let t = &nested.ty;
 
-            let field_opts = FieldOpts::from_field(&nested).expect("Unable to parse field options");
+            let field_opts = FieldOpts::from_field(nested).expect("Unable to parse field options");
 
             let default = match &field_opts.default {
                 Some(Override::Inherit) => {