aboutsummaryrefslogtreecommitdiff
path: root/macros/src
diff options
context:
space:
mode:
authorGravatar Henrik Tjäder <henrik@grepit.se> 2022-02-09 18:56:35 +0100
committerGravatar Henrik Tjäder <henrik@grepit.se> 2022-02-09 18:58:50 +0100
commit099544f655795aa63b87d2f0b004331a57b93dbe (patch)
tree9970e72816d4e19a75406889eda80bf488666266 /macros/src
parent10ec36b4434d3ba0426ad427c321067286ebc00c (diff)
downloadrtic-099544f655795aa63b87d2f0b004331a57b93dbe.tar.gz
rtic-099544f655795aa63b87d2f0b004331a57b93dbe.tar.zst
rtic-099544f655795aa63b87d2f0b004331a57b93dbe.zip
Fix/mute clippy errors
Diffstat (limited to 'macros/src')
-rw-r--r--macros/src/codegen/module.rs2
-rw-r--r--macros/src/codegen/software_tasks.rs1
-rw-r--r--macros/src/codegen/util.rs26
3 files changed, 9 insertions, 20 deletions
diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 996af641..8410b7d7 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -269,7 +269,7 @@ pub fn codegen(
let m_ident = util::monotonic_ident(&monotonic_name);
let m_isr = &monotonic.args.binds;
let enum_ = util::interrupt_ident();
- let spawn_handle_string = format!("{}::SpawnHandle", m.to_string());
+ let spawn_handle_string = format!("{}::SpawnHandle", m);
let (enable_interrupt, pend) = if &*m_isr.to_string() == "SysTick" {
(
diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs
index 2008b6c9..c767032f 100644
--- a/macros/src/codegen/software_tasks.rs
+++ b/macros/src/codegen/software_tasks.rs
@@ -38,6 +38,7 @@ pub fn codegen(
// Create free queues and inputs / instants buffers
let fq = util::fq_ident(name);
+ #[allow(clippy::redundant_closure)]
let (fq_ty, fq_expr, mk_uninit): (_, _, Box<dyn Fn() -> Option<_>>) = {
(
quote!(rtic::export::SCFQ<#cap_lit_p1>),
diff --git a/macros/src/codegen/util.rs b/macros/src/codegen/util.rs
index e8654345..46eace4c 100644
--- a/macros/src/codegen/util.rs
+++ b/macros/src/codegen/util.rs
@@ -16,7 +16,7 @@ pub fn capacity_literal(capacity: usize) -> LitInt {
/// Identifier for the free queue
pub fn fq_ident(task: &Ident) -> Ident {
- mark_internal_name(&format!("{}_FQ", task.to_string()))
+ mark_internal_name(&format!("{}_FQ", task))
}
/// Generates a `Mutex` implementation
@@ -103,17 +103,12 @@ pub fn mark_internal_name(name: &str) -> Ident {
/// Generate an internal identifier for monotonics
pub fn internal_monotonics_ident(task: &Ident, monotonic: &Ident, ident_name: &str) -> Ident {
- mark_internal_name(&format!(
- "{}_{}_{}",
- task.to_string(),
- monotonic.to_string(),
- ident_name,
- ))
+ mark_internal_name(&format!("{}_{}_{}", task, monotonic, ident_name,))
}
/// Generate an internal identifier for tasks
pub fn internal_task_ident(task: &Ident, ident_name: &str) -> Ident {
- mark_internal_name(&format!("{}_{}", task.to_string(), ident_name))
+ mark_internal_name(&format!("{}_{}", task, ident_name))
}
fn link_section_index() -> usize {
@@ -253,26 +248,19 @@ pub fn monotonic_ident(name: &str) -> Ident {
}
pub fn static_shared_resource_ident(name: &Ident) -> Ident {
- mark_internal_name(&format!("shared_resource_{}", name.to_string()))
+ mark_internal_name(&format!("shared_resource_{}", name))
}
pub fn static_local_resource_ident(name: &Ident) -> Ident {
- mark_internal_name(&format!("local_resource_{}", name.to_string()))
+ mark_internal_name(&format!("local_resource_{}", name))
}
pub fn declared_static_local_resource_ident(name: &Ident, task_name: &Ident) -> Ident {
- mark_internal_name(&format!(
- "local_{}_{}",
- task_name.to_string(),
- name.to_string()
- ))
+ mark_internal_name(&format!("local_{}_{}", task_name, name))
}
pub fn need_to_lock_ident(name: &Ident) -> Ident {
- Ident::new(
- &format!("{}_that_needs_to_be_locked", name.to_string()),
- name.span(),
- )
+ Ident::new(&format!("{}_that_needs_to_be_locked", name), name.span())
}
/// The name to get better RT flag errors