aboutsummaryrefslogtreecommitdiff
path: root/macros/src
diff options
context:
space:
mode:
authorGravatar Henrik Tjäder <henrik@tjaders.com> 2020-09-08 15:22:32 +0000
committerGravatar Henrik Tjäder <henrik@tjaders.com> 2020-09-25 14:33:02 +0000
commita151974245a994ec4c30bb0518677c4b99dce7e9 (patch)
tree6233b991dc966d2683fdca270843ad6c657a0aa1 /macros/src
parent6d234f9c95bb9971c6b79f4a7a0bb6ff44236afc (diff)
downloadrtic-a151974245a994ec4c30bb0518677c4b99dce7e9.tar.gz
rtic-a151974245a994ec4c30bb0518677c4b99dce7e9.tar.zst
rtic-a151974245a994ec4c30bb0518677c4b99dce7e9.zip
cfg_core is gone, cargo fmt
Diffstat (limited to 'macros/src')
-rw-r--r--macros/src/codegen.rs26
-rw-r--r--macros/src/codegen/hardware_tasks.rs3
-rw-r--r--macros/src/codegen/idle.rs12
-rw-r--r--macros/src/codegen/init.rs11
-rw-r--r--macros/src/codegen/resources.rs1
-rw-r--r--macros/src/codegen/software_tasks.rs2
6 files changed, 36 insertions, 19 deletions
diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs
index fde9490b..e45f1a38 100644
--- a/macros/src/codegen.rs
+++ b/macros/src/codegen.rs
@@ -37,11 +37,13 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let pre_init_stmts = pre_init::codegen(&app, analysis, extra);
- let (const_app_init, root_init, user_init, user_init_imports, call_init) = init::codegen(app, analysis, extra);
+ let (const_app_init, root_init, user_init, user_init_imports, call_init) =
+ init::codegen(app, analysis, extra);
let post_init_stmts = post_init::codegen(&app, analysis);
- let (const_app_idle, root_idle, user_idle, user_idle_imports, call_idle) = idle::codegen(app, analysis, extra);
+ let (const_app_idle, root_idle, user_idle, user_idle_imports, call_idle) =
+ idle::codegen(app, analysis, extra);
if user_init.is_some() {
const_app_imports.push(quote!(
@@ -95,13 +97,22 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
}
));
- let (const_app_resources, mod_resources, mod_resources_imports) = resources::codegen(app, analysis, extra);
+ let (const_app_resources, mod_resources, mod_resources_imports) =
+ resources::codegen(app, analysis, extra);
- let (const_app_hardware_tasks, root_hardware_tasks, user_hardware_tasks, user_hardware_tasks_imports) =
- hardware_tasks::codegen(app, analysis, extra);
+ let (
+ const_app_hardware_tasks,
+ root_hardware_tasks,
+ user_hardware_tasks,
+ user_hardware_tasks_imports,
+ ) = hardware_tasks::codegen(app, analysis, extra);
- let (const_app_software_tasks, root_software_tasks, user_software_tasks, user_software_tasks_imports) =
- software_tasks::codegen(app, analysis, extra);
+ let (
+ const_app_software_tasks,
+ root_software_tasks,
+ user_software_tasks,
+ user_software_tasks_imports,
+ ) = software_tasks::codegen(app, analysis, extra);
let const_app_dispatchers = dispatchers::codegen(app, analysis, extra);
@@ -111,7 +122,6 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let const_app_schedule = schedule::codegen(app, extra);
-
let user_imports = app.user_imports.clone();
let name = &app.name;
let device = extra.device;
diff --git a/macros/src/codegen/hardware_tasks.rs b/macros/src/codegen/hardware_tasks.rs
index 8f2ab2f6..a03fd779 100644
--- a/macros/src/codegen/hardware_tasks.rs
+++ b/macros/src/codegen/hardware_tasks.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::{quote, format_ident};
+use quote::{format_ident, quote};
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -128,7 +128,6 @@ pub fn codegen(
#[allow(non_snake_case)]
use super::#name;
));
-
}
(const_app, root, user_tasks, hardware_tasks_imports)
diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index db454a58..2aa99751 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::{quote, format_ident};
+use quote::{format_ident, quote};
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -52,7 +52,6 @@ pub fn codegen(
#[allow(non_snake_case)]
use super::#name_resource;
));
-
}
if !idle.locals.is_empty() {
@@ -81,7 +80,6 @@ pub fn codegen(
user_idle_imports.push(quote!(
#(#attrs)*
#[allow(non_snake_case)]
- #cfg_core
use super::#name;
));
@@ -91,7 +89,13 @@ pub fn codegen(
#name::Context::new(&rtic::export::Priority::new(0))
));
- (const_app, root_idle, user_idle, user_idle_imports, call_idle)
+ (
+ const_app,
+ root_idle,
+ user_idle,
+ user_idle_imports,
+ call_idle,
+ )
} else {
(
None,
diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 88a7a23b..b350298c 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::{quote, format_ident};
+use quote::{format_ident, quote};
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -101,7 +101,6 @@ pub fn codegen(
));
user_init_imports.push(quote!(
#(#attrs)*
- #cfg_core
#[allow(non_snake_case)]
use super::#name;
));
@@ -128,7 +127,13 @@ pub fn codegen(
root_init.push(module::codegen(Context::Init, needs_lt, app, extra));
- (const_app, root_init, user_init, user_init_imports, call_init)
+ (
+ const_app,
+ root_init,
+ user_init,
+ user_init_imports,
+ call_init,
+ )
} else {
(None, vec![], None, vec![], None)
}
diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index a326e68c..d18a4655 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -88,7 +88,6 @@ pub fn codegen(
mod_resources_imports.push(quote!(
#[allow(non_camel_case_types)]
#(#cfgs)*
- #cfg_core
use super::resources::#name;
));
diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs
index 854c083d..9e011152 100644
--- a/macros/src/codegen/software_tasks.rs
+++ b/macros/src/codegen/software_tasks.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::{quote, format_ident};
+use quote::{format_ident, quote};
use rtic_syntax::{ast::App, Context};
use crate::{