From c40c89bb4edc22c4a60d8677c660a9ab7eb47e92 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 8 Jan 2023 21:30:53 +0100
Subject: Clippy fixes

---
 macros/src/syntax/parse/app.rs           |  6 ++----
 macros/src/syntax/parse/hardware_task.rs | 10 ++++------
 macros/src/syntax/parse/idle.rs          |  5 ++---
 macros/src/syntax/parse/init.rs          |  5 ++---
 macros/src/syntax/parse/software_task.rs | 10 ++++------
 macros/src/syntax/parse/util.rs          | 14 +++++---------
 6 files changed, 19 insertions(+), 31 deletions(-)

(limited to 'macros/src/syntax')

diff --git a/macros/src/syntax/parse/app.rs b/macros/src/syntax/parse/app.rs
index 8a9242e..e797f75 100644
--- a/macros/src/syntax/parse/app.rs
+++ b/macros/src/syntax/parse/app.rs
@@ -450,8 +450,7 @@ impl App {
             return Err(parse::Error::new(
                 init.user_shared_struct.span(),
                 format!(
-                    "This name and the one defined on `#[shared]` are not the same. Should this be `{}`?",
-                    shared_resources_ident
+                    "This name and the one defined on `#[shared]` are not the same. Should this be `{shared_resources_ident}`?"
                 ),
             ));
         }
@@ -460,8 +459,7 @@ impl App {
             return Err(parse::Error::new(
                 init.user_local_struct.span(),
                 format!(
-                    "This name and the one defined on `#[local]` are not the same. Should this be `{}`?",
-                    local_resources_ident
+                    "This name and the one defined on `#[local]` are not the same. Should this be `{local_resources_ident}`?"
                 ),
             ));
         }
diff --git a/macros/src/syntax/parse/hardware_task.rs b/macros/src/syntax/parse/hardware_task.rs
index ff94bc5..6207e56 100644
--- a/macros/src/syntax/parse/hardware_task.rs
+++ b/macros/src/syntax/parse/hardware_task.rs
@@ -39,9 +39,8 @@ impl HardwareTask {
 
         Err(parse::Error::new(
             span,
-            &format!(
-                "this task handler must have type signature `fn({}::Context)`",
-                name
+            format!(
+                "this task handler must have type signature `fn({name}::Context)`"
             ),
         ))
     }
@@ -83,9 +82,8 @@ impl HardwareTask {
 
         Err(parse::Error::new(
             span,
-            &format!(
-                "this task handler must have type signature `fn({}::Context)`",
-                name
+            format!(
+                "this task handler must have type signature `fn({name}::Context)`"
             ),
         ))
     }
diff --git a/macros/src/syntax/parse/idle.rs b/macros/src/syntax/parse/idle.rs
index ffec358..aa2ef5e 100644
--- a/macros/src/syntax/parse/idle.rs
+++ b/macros/src/syntax/parse/idle.rs
@@ -34,9 +34,8 @@ impl Idle {
 
         Err(parse::Error::new(
             item.sig.ident.span(),
-            &format!(
-                "this `#[idle]` function must have signature `fn({}::Context) -> !`",
-                name
+            format!(
+                "this `#[idle]` function must have signature `fn({name}::Context) -> !`"
             ),
         ))
     }
diff --git a/macros/src/syntax/parse/init.rs b/macros/src/syntax/parse/init.rs
index 61d3539..23130c8 100644
--- a/macros/src/syntax/parse/init.rs
+++ b/macros/src/syntax/parse/init.rs
@@ -41,9 +41,8 @@ impl Init {
 
         Err(parse::Error::new(
             span,
-            &format!(
-                "the `#[init]` function must have signature `fn({}::Context) -> (Shared resources struct, Local resources struct)`",
-                name
+            format!(
+                "the `#[init]` function must have signature `fn({name}::Context) -> (Shared resources struct, Local resources struct)`"
             ),
         ))
     }
diff --git a/macros/src/syntax/parse/software_task.rs b/macros/src/syntax/parse/software_task.rs
index 6be597e..319620a 100644
--- a/macros/src/syntax/parse/software_task.rs
+++ b/macros/src/syntax/parse/software_task.rs
@@ -33,9 +33,8 @@ impl SoftwareTask {
 
         Err(parse::Error::new(
             span,
-            &format!(
-                "this task handler must have type signature `async fn({}::Context)`",
-                name
+            format!(
+                "this task handler must have type signature `async fn({name}::Context)`"
             ),
         ))
     }
@@ -71,9 +70,8 @@ impl SoftwareTask {
 
         Err(parse::Error::new(
             span,
-            &format!(
-                "this task handler must have type signature `async fn({}::Context)`",
-                name
+            format!(
+                "this task handler must have type signature `async fn({name}::Context)`"
             ),
         ))
     }
diff --git a/macros/src/syntax/parse/util.rs b/macros/src/syntax/parse/util.rs
index 28c3eac..900ef9d 100644
--- a/macros/src/syntax/parse/util.rs
+++ b/macros/src/syntax/parse/util.rs
@@ -234,17 +234,13 @@ pub fn parse_local_resources(content: ParseStream<'_>) -> parse::Result<LocalRes
 pub fn parse_inputs(inputs: Punctuated<FnArg, Token![,]>, name: &str) -> Option<Box<Pat>> {
     let mut inputs = inputs.into_iter();
 
-    match inputs.next() {
-        Some(FnArg::Typed(first)) => {
-            if type_is_path(&first.ty, &[name, "Context"]) {
-                // No more inputs
-                if inputs.next().is_none() {
-                    return Some(first.pat);
-                }
+    if let Some(FnArg::Typed(first)) = inputs.next() {
+        if type_is_path(&first.ty, &[name, "Context"]) {
+            // No more inputs
+            if inputs.next().is_none() {
+                return Some(first.pat);
             }
         }
-
-        _ => {}
     }
 
     None
-- 
cgit v1.2.3