aboutsummaryrefslogtreecommitdiff
path: root/macros/src/codegen
diff options
context:
space:
mode:
Diffstat (limited to 'macros/src/codegen')
-rw-r--r--macros/src/codegen/async_dispatchers.rs3
-rw-r--r--macros/src/codegen/main.rs14
-rw-r--r--macros/src/codegen/pre_init.rs6
-rw-r--r--macros/src/codegen/util.rs16
4 files changed, 17 insertions, 22 deletions
diff --git a/macros/src/codegen/async_dispatchers.rs b/macros/src/codegen/async_dispatchers.rs
index f6408e1e..be02ad09 100644
--- a/macros/src/codegen/async_dispatchers.rs
+++ b/macros/src/codegen/async_dispatchers.rs
@@ -85,8 +85,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> TokenStream2 {
if level > 0 {
let doc = format!(
- "Interrupt handler to dispatch async tasks at priority {}",
- level
+ "Interrupt handler to dispatch async tasks at priority {level}"
);
let attribute = &interrupts.get(&level).expect("UNREACHABLE").1.attrs;
items.push(quote!(
diff --git a/macros/src/codegen/main.rs b/macros/src/codegen/main.rs
index 8e7138f4..2775d259 100644
--- a/macros/src/codegen/main.rs
+++ b/macros/src/codegen/main.rs
@@ -15,15 +15,13 @@ pub fn codegen(app: &App, analysis: &Analysis) -> TokenStream2 {
let call_idle = if let Some(idle) = &app.idle {
let name = &idle.name;
quote!(#name(#name::Context::new()))
+ } else if analysis.channels.get(&0).is_some() {
+ let dispatcher = util::zero_prio_dispatcher_ident();
+ quote!(#dispatcher();)
} else {
- if analysis.channels.get(&0).is_some() {
- let dispatcher = util::zero_prio_dispatcher_ident();
- quote!(#dispatcher();)
- } else {
- quote!(loop {
- rtic::export::nop()
- })
- }
+ quote!(loop {
+ rtic::export::nop()
+ })
};
let main = util::suffixed("main");
diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index 14926888..28ba29c0 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -40,8 +40,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
}
})) {
let es = format!(
- "Maximum priority used by interrupt vector '{}' is more than supported by hardware",
- name
+ "Maximum priority used by interrupt vector '{name}' is more than supported by hardware"
);
// Compile time assert that this priority is supported by the device
stmts.push(quote!(
@@ -69,8 +68,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
}
}) {
let es = format!(
- "Maximum priority used by interrupt vector '{}' is more than supported by hardware",
- name
+ "Maximum priority used by interrupt vector '{name}' is more than supported by hardware"
);
// Compile time assert that this priority is supported by the device
stmts.push(quote!(
diff --git a/macros/src/codegen/util.rs b/macros/src/codegen/util.rs
index 6552839f..a0caf0ae 100644
--- a/macros/src/codegen/util.rs
+++ b/macros/src/codegen/util.rs
@@ -51,7 +51,7 @@ pub fn impl_mutex(
/// Generates an identifier for the `EXECUTOR_RUN` atomics (`async` API)
pub fn executor_run_ident(task: &Ident) -> Ident {
- mark_internal_name(&format!("{}_EXECUTOR_RUN", task))
+ mark_internal_name(&format!("{task}_EXECUTOR_RUN"))
}
pub fn interrupt_ident() -> Ident {
@@ -78,12 +78,12 @@ pub fn is_exception(name: &Ident) -> bool {
/// Mark a name as internal
pub fn mark_internal_name(name: &str) -> Ident {
- Ident::new(&format!("{}_{}", RTIC_INTERNAL, name), Span::call_site())
+ Ident::new(&format!("{RTIC_INTERNAL}_{name}"), Span::call_site())
}
/// Generate an internal identifier for tasks
pub fn internal_task_ident(task: &Ident, ident_name: &str) -> Ident {
- mark_internal_name(&format!("{}_{}", task, ident_name))
+ mark_internal_name(&format!("{task}_{ident_name}"))
}
fn link_section_index() -> usize {
@@ -153,7 +153,7 @@ pub fn local_resources_ident(ctxt: Context, app: &App) -> Ident {
/// Generates an identifier for a ready queue, async task version
pub fn rq_async_ident(async_task_name: &Ident) -> Ident {
- mark_internal_name(&format!("ASYNC_TASK_{}_RQ", async_task_name))
+ mark_internal_name(&format!("ASYNC_TASK_{async_task_name}_RQ"))
}
/// Suffixed identifier
@@ -163,7 +163,7 @@ pub fn suffixed(name: &str) -> Ident {
}
pub fn static_shared_resource_ident(name: &Ident) -> Ident {
- mark_internal_name(&format!("shared_resource_{}", name))
+ mark_internal_name(&format!("shared_resource_{name}"))
}
/// Generates an Ident for the number of 32 bit chunks used for Mask storage.
@@ -176,15 +176,15 @@ pub fn priority_masks_ident() -> Ident {
}
pub fn static_local_resource_ident(name: &Ident) -> Ident {
- mark_internal_name(&format!("local_resource_{}", name))
+ 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, name))
+ 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), name.span())
+ Ident::new(&format!("{name}_that_needs_to_be_locked"), name.span())
}
pub fn zero_prio_dispatcher_ident() -> Ident {