diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-10-22 16:48:56 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-10-22 16:48:56 +0000 |
| commit | 9fb5a223cb8adb01381650b66eab28ea5abc98ed (patch) | |
| tree | 357983fd15ba52ea221f20b5cb14b96783d07d51 /macros/src/codegen/dispatchers.rs | |
| parent | 6de4f1a797c81aec6c24f47872e5d3968344684c (diff) | |
| parent | 17e976ab495234f9f53f56e6693850af077cf701 (diff) | |
| download | rtic-9fb5a223cb8adb01381650b66eab28ea5abc98ed.tar.gz rtic-9fb5a223cb8adb01381650b66eab28ea5abc98ed.tar.zst rtic-9fb5a223cb8adb01381650b66eab28ea5abc98ed.zip | |
Merge #396
396: Fix namespaces r=AfoHT a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'macros/src/codegen/dispatchers.rs')
| -rw-r--r-- | macros/src/codegen/dispatchers.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/macros/src/codegen/dispatchers.rs b/macros/src/codegen/dispatchers.rs index bf6986b8..a76f622e 100644 --- a/macros/src/codegen/dispatchers.rs +++ b/macros/src/codegen/dispatchers.rs @@ -57,7 +57,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream ); items.push(quote!( #[doc = #doc] - pub static mut #rq: #rq_ty = #rq_expr; + static mut #rq: #rq_ty = #rq_expr; )); let arms = channel @@ -90,6 +90,8 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream quote!(#name::Locals::new(),) }; + let app_name = &app.name; + let app_path = quote! {crate::#app_name}; quote!( #(#cfgs)* #t::#name => { @@ -98,7 +100,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream #let_instant #fq.split().0.enqueue_unchecked(index); let priority = &rtic::export::Priority::new(PRIORITY); - crate::#name( + #app_path::#name( #locals_new #name::Context::new(priority #instant) #(,#pats)* |