diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-11-15 18:13:38 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-11-15 18:13:38 +0000 |
| commit | 53b2454799830cd424bf8b293e2106249bf0b4d5 (patch) | |
| tree | 3c05a059d2b174b8adb6b1b6e76493178b607e45 /macros/src | |
| parent | 9527c921923f6b8e19767b1bf52be758817d7035 (diff) | |
| parent | ad7b5a90c49da6078025d5ac46d1f48656836bfd (diff) | |
| download | rtic-53b2454799830cd424bf8b293e2106249bf0b4d5.tar.gz rtic-53b2454799830cd424bf8b293e2106249bf0b4d5.tar.zst rtic-53b2454799830cd424bf8b293e2106249bf0b4d5.zip | |
Merge #416
416: Move entry-point main into a separate module r=korken89 a=AfoHT
Prevents conflict with user provided tasks named main
Curious what the full test suite will make of this
Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
Diffstat (limited to 'macros/src')
| -rw-r--r-- | macros/src/codegen.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs index 8309473a..3cddf570 100644 --- a/macros/src/codegen.rs +++ b/macros/src/codegen.rs @@ -57,19 +57,22 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 { let main = util::suffixed("main"); mains.push(quote!( - #[no_mangle] - unsafe extern "C" fn #main() -> ! { - let _TODO: () = (); + mod rtic_ext { + use super::*; + #[no_mangle] + unsafe extern "C" fn #main() -> ! { + let _TODO: () = (); - #(#assertion_stmts)* + #(#assertion_stmts)* - #(#pre_init_stmts)* + #(#pre_init_stmts)* - #call_init + #call_init - #(#post_init_stmts)* + #(#post_init_stmts)* - #call_idle + #call_idle + } } )); |