aboutsummaryrefslogtreecommitdiff
path: root/macros/src/syntax/parse
diff options
context:
space:
mode:
authorGravatar Emil Fresk <emil.fresk@gmail.com> 2023-01-08 21:30:53 +0100
committerGravatar Henrik Tjäder <henrik@tjaders.com> 2023-03-01 00:33:29 +0100
commitc40c89bb4edc22c4a60d8677c660a9ab7eb47e92 (patch)
tree3ba72592f324dd7bef32773211b093e4949d6ff0 /macros/src/syntax/parse
parent6d252785e83218eeb5d080836281c90b86ca0e03 (diff)
downloadrtic-c40c89bb4edc22c4a60d8677c660a9ab7eb47e92.tar.gz
rtic-c40c89bb4edc22c4a60d8677c660a9ab7eb47e92.tar.zst
rtic-c40c89bb4edc22c4a60d8677c660a9ab7eb47e92.zip
Clippy fixes
Diffstat (limited to 'macros/src/syntax/parse')
-rw-r--r--macros/src/syntax/parse/app.rs6
-rw-r--r--macros/src/syntax/parse/hardware_task.rs10
-rw-r--r--macros/src/syntax/parse/idle.rs5
-rw-r--r--macros/src/syntax/parse/init.rs5
-rw-r--r--macros/src/syntax/parse/software_task.rs10
-rw-r--r--macros/src/syntax/parse/util.rs14
6 files changed, 19 insertions, 31 deletions
diff --git a/macros/src/syntax/parse/app.rs b/macros/src/syntax/parse/app.rs
index 8a9242e9..e797f75e 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 ff94bc51..6207e564 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 ffec358f..aa2ef5e9 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 61d35391..23130c85 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 6be597e8..319620a4 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 28c3eac6..900ef9d6 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