diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-06-11 16:22:33 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-06-11 16:22:33 +0000 |
| commit | 4795c1dba39b908bcab4ac148e691e2e99594289 (patch) | |
| tree | 169da65f2ba2ede45eaf40bcfb6c76a87c4b443a /macros/src | |
| parent | 4397fbf76285658a108b0f17665f4024d97cfcb3 (diff) | |
| parent | 0ad311074e3d49a66174f59c47c4d6183ce7e3a0 (diff) | |
| download | rtic-4795c1dba39b908bcab4ac148e691e2e99594289.tar.gz rtic-4795c1dba39b908bcab4ac148e691e2e99594289.tar.zst rtic-4795c1dba39b908bcab4ac148e691e2e99594289.zip | |
Merge #315
315: allow handlers to be named 'main' r=korken89 a=japaric
`#[init]`, `#[idle]` and `#[task]` handlers can now be named `main`
fixes #311
Co-authored-by: Jorge Aparicio <jorge.aparicio@ferrous-systems.com>
Diffstat (limited to 'macros/src')
| -rw-r--r-- | macros/src/codegen/dispatchers.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen/idle.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen/init.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/macros/src/codegen/dispatchers.rs b/macros/src/codegen/dispatchers.rs index 9a9cb102..1400786b 100644 --- a/macros/src/codegen/dispatchers.rs +++ b/macros/src/codegen/dispatchers.rs @@ -141,7 +141,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream #let_instant #fq.split().0.enqueue_unchecked(index); let priority = &rtfm::export::Priority::new(PRIORITY); - #name( + crate::#name( #locals_new #name::Context::new(priority #instant) #(,#pats)* diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs index 35a72523..72432f67 100644 --- a/macros/src/codegen/idle.rs +++ b/macros/src/codegen/idle.rs @@ -72,7 +72,7 @@ pub fn codegen( )); let locals_new = locals_new.iter(); - let call_idle = quote!(#name( + let call_idle = quote!(crate::#name( #(#locals_new,)* #name::Context::new(&rtfm::export::Priority::new(0)) )); diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs index 9e5c4798..534b79b0 100644 --- a/macros/src/codegen/init.rs +++ b/macros/src/codegen/init.rs @@ -109,7 +109,7 @@ pub fn codegen( let locals_new = locals_new.iter(); let call_init = - Some(quote!(let late = #name(#(#locals_new,)* #name::Context::new(core.into()));)); + Some(quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));)); root_init.push(module::codegen(Context::Init(core), needs_lt, app, extra)); |