mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-27 14:04:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Since there only will be one init/idle use .first().unwrap(), matching rtic-syntax

Browse source
This commit is contained in:
Henrik Tjäder 2020-09-01 16:12:42 +00:00
parent f151d5871c
commit d8c9476372
5 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
macros/src/codegen/idle.rs
View file

@ -26,9 +26,8 @@ pub fn codegen(
// call_idle
TokenStream2,
) {
//if let Some(idle) = app.idles.get(&core) {
if app.idles.len() > 0 {
let idle = &app.idles[0];
let idle = &app.idles.first().unwrap();
let mut needs_lt = false;
let mut const_app = None;
let mut root_idle = vec![];

3
macros/src/codegen/init.rs
View file

@ -27,9 +27,8 @@ pub fn codegen(
// call_init -- the call to the user `#[init]` if there's one
Option<TokenStream2>,
) {
//if let Some(init) = app.inits.get(&core) {
if app.inits.len() > 0 {
let init = &app.inits[0];
let init = &app.inits.first().unwrap();
let mut needs_lt = false;
let name = &init.name;

2
macros/src/codegen/module.rs
View file

@ -253,7 +253,7 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) ->
}
if let Context::Init = ctxt {
let init = &app.inits[0];
let init = &app.inits.first().unwrap();
if init.returns_late_resources {
let late_resources = util::late_resources_ident(&init.name);

4
macros/src/codegen/resources_struct.rs
View file

@ -14,8 +14,8 @@ pub fn codegen(
let mut lt = None;
let resources = match ctxt {
Context::Init => &app.inits[0].args.resources,
Context::Idle => &app.idles[0].args.resources,
Context::Init => &app.inits.first().unwrap().args.resources,
Context::Idle => &app.idles.first().unwrap().args.resources,
Context::HardwareTask(name) => &app.hardware_tasks[name].args.resources,
Context::SoftwareTask(name) => &app.software_tasks[name].args.resources,
};

15
macros/src/codegen/util.rs
View file

@ -165,8 +165,8 @@ pub fn link_section_uninit(empty_expr: bool) -> Option<TokenStream2> {
/// Generates a pre-reexport identifier for the "locals" struct
pub fn locals_ident(ctxt: Context, app: &App) -> Ident {
let mut s = match ctxt {
Context::Init => app.inits[0].name.to_string(),
Context::Idle => app.idles[0].name.to_string(),
Context::Init => app.inits.first().unwrap().name.to_string(),
Context::Idle => app.idles.first().unwrap().name.to_string(),
Context::HardwareTask(ident) | Context::SoftwareTask(ident) => ident.to_string(),
};
@ -234,8 +234,8 @@ pub fn regroup_inputs(
/// Generates a pre-reexport identifier for the "resources" struct
pub fn resources_ident(ctxt: Context, app: &App) -> Ident {
let mut s = match ctxt {
Context::Init => app.inits[0].name.to_string(),
Context::Idle => app.idles[0].name.to_string(),
Context::Init => app.inits.first().unwrap().name.to_string(),
Context::Idle => app.idles.first().unwrap().name.to_string(),
Context::HardwareTask(ident) | Context::SoftwareTask(ident) => ident.to_string(),
};
@ -266,13 +266,6 @@ pub fn schedule_t_ident() -> Ident {
Ident::new(&format!("T"), Span::call_site())
}
/*
/// Generates an identifier for a cross-spawn barrier
pub fn spawn_barrier() -> Ident {
Ident::new(&format!("SB"), Span::call_site())
}
*/
/// Generates an identifier for a "spawn" function
///
/// The methods of the `Spawn` structs invoke these functions. As one task may be `spawn`-ed by