Merge #396

396: Fix namespaces r=AfoHT a=korken89



Co-authored-by: Emil Fresk <emil.fresk@gmail.com>

examples/baseline.rs

@@ -5,13 +5,14 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 // NOTE: does NOT properly work on QEMU
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[init]
     fn init(cx: init::Context) -> init::LateResources {
         // omitted: initialization of `CYCCNT`

examples/binds.rs

@@ -5,13 +5,14 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 // `examples/interrupt.rs` rewritten to use `binds`
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(Interrupt::UART0);

examples/capacity.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(Interrupt::UART0);

examples/cfg.rs

@@ -5,13 +5,14 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
-#[cfg(debug_assertions)]
-use cortex_m_semihosting::hprintln;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::debug;
+    #[cfg(debug_assertions)]
+    use cortex_m_semihosting::hprintln;
+
     #[resources]
     struct Resources {
         #[cfg(debug_assertions)] // <- `true` when using the `dev` profile

examples/destructure.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::hprintln;
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::hprintln;
+    use lm3s6965::Interrupt;
+
     #[resources]
     struct Resources {
         // Some resources to work with

examples/double_schedule.rs

@@ -6,10 +6,10 @@
 #![no_std]
 
 use panic_semihosting as _;
-use rtic::cyccnt::U32Ext;
 
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
 mod app {
+    use rtic::cyccnt::U32Ext;
 
     #[resources]
     struct Resources {

examples/generics.rs

@@ -5,13 +5,16 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
+use cortex_m_semihosting::hprintln;
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
-use rtic::{Exclusive, Mutex};
+use rtic::Mutex;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+    use rtic::Exclusive;
+
     #[resources]
     struct Resources {
         #[init(0)]
@@ -33,7 +36,7 @@ mod app {
         hprintln!("UART0(STATE = {})", *STATE).unwrap();
 
         // second argument has type `resources::shared`
-        advance(STATE, c.resources.shared);
+        super::advance(STATE, c.resources.shared);
 
         rtic::pend(Interrupt::UART1);
 
@@ -50,7 +53,7 @@ mod app {
         *c.resources.shared += 0;
 
         // second argument has type `Exclusive<u32>`
-        advance(STATE, Exclusive(c.resources.shared));
+        super::advance(STATE, Exclusive(c.resources.shared));
     }
 }
 

examples/hardware.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         // Pends the UART0 interrupt but its handler won't run until *after*

examples/idle.rs

@@ -5,11 +5,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         hprintln!("init").unwrap();

examples/init.rs

@@ -5,11 +5,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965, peripherals = true)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[init]
     fn init(cx: init::Context) -> init::LateResources {
         static mut X: u32 = 0;

examples/late.rs

@@ -5,21 +5,18 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use heapless::{
-    consts::*,
-    i,
-    spsc::{Consumer, Producer, Queue},
-};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
     use heapless::{
         consts::*,
-        spsc::{Consumer, Producer},
+        i,
+        spsc::{Consumer, Producer, Queue},
     };
+    use lm3s6965::Interrupt;
+
     // Late resources
     #[resources]
     struct Resources {

examples/lock.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[resources]
     struct Resources {
         #[init(0)]

examples/message.rs

@@ -5,11 +5,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         foo::spawn(/* no message */).unwrap();

examples/not-sync.rs

@@ -6,8 +6,6 @@
 #![no_std]
 
 use core::marker::PhantomData;
-
-use cortex_m_semihosting::debug;
 use panic_halt as _;
 
 pub struct NotSync {
@@ -18,6 +16,7 @@ pub struct NotSync {
 mod app {
     use super::NotSync;
     use core::marker::PhantomData;
+    use cortex_m_semihosting::debug;
 
     #[resources]
     struct Resources {

examples/only-shared-access.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[resources]
     struct Resources {
         key: u32,

examples/periodic.rs

@@ -5,15 +5,15 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::hprintln;
 use panic_semihosting as _;
-use rtic::cyccnt::{Instant, U32Ext};
-
-const PERIOD: u32 = 8_000_000;
 
 // NOTE: does NOT work on QEMU!
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
 mod app {
+    use cortex_m_semihosting::hprintln;
+    use rtic::cyccnt::{Instant, U32Ext};
+
+    const PERIOD: u32 = 8_000_000;
 
     #[init]
     fn init(cx: init::Context) -> init::LateResources {

examples/peripherals-taken.rs

@@ -3,11 +3,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::debug;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         assert!(cortex_m::Peripherals::take().is_none());

examples/pool.rs

@@ -5,12 +5,10 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use heapless::{
     pool,
     pool::singleton::{Box, Pool},
 };
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 use rtic::app;
 
@@ -19,7 +17,9 @@ pool!(P: [u8; 128]);
 
 #[app(device = lm3s6965)]
 mod app {
-    use crate::Box;
+    use crate::{Box, Pool};
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
 
     // Import the memory pool into scope
     use super::P;

examples/preempt.rs

@@ -3,13 +3,14 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 use rtic::app;
 
 #[app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(Interrupt::GPIOA);

examples/ramfunc.rs

@@ -5,11 +5,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         foo::spawn().unwrap();

examples/resource-user-struct.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[resources]
     struct Resources {
         // A resource

examples/resource.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[resources]
     struct Resources {
         // A resource

examples/schedule.rs

@@ -5,14 +5,15 @@
 #![no_main]
 #![no_std]
 
-use cortex_m::peripheral::DWT;
-use cortex_m_semihosting::hprintln;
 use panic_halt as _;
-use rtic::cyccnt::{Instant, U32Ext as _};
 
 // NOTE: does NOT work on QEMU!
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
 mod app {
+    use cortex_m::peripheral::DWT;
+    use cortex_m_semihosting::hprintln;
+    use rtic::cyccnt::{Instant, U32Ext as _};
+
     #[init()]
     fn init(mut cx: init::Context) -> init::LateResources {
         // Initialize (enable) the monotonic timer (CYCCNT)

examples/shared-with-init.rs

@@ -5,8 +5,6 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
-use lm3s6965::Interrupt;
 use panic_halt as _;
 use rtic::app;
 
@@ -15,6 +13,8 @@ pub struct MustBeSend;
 #[app(device = lm3s6965)]
 mod app {
     use super::MustBeSend;
+    use cortex_m_semihosting::debug;
+    use lm3s6965::Interrupt;
 
     #[resources]
     struct Resources {

examples/spawn.rs

@@ -5,11 +5,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[init]
     fn init(_c: init::Context) -> init::LateResources {
         foo::spawn(1, 2).unwrap();

examples/spawn2.rs

@@ -5,11 +5,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[init]
     fn init(_c: init::Context) -> init::LateResources {
         foo::spawn(1, 2).unwrap();

examples/static.rs

@@ -5,20 +5,18 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use heapless::{
-    consts::*,
-    i,
-    spsc::{Consumer, Producer, Queue},
-};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
 
-    use crate::U4;
+    use cortex_m_semihosting::{debug, hprintln};
-    use crate::{Consumer, Producer};
+    use heapless::{
+        consts::*,
+        i,
+        spsc::{Consumer, Producer, Queue},
+    };
+    use lm3s6965::Interrupt;
 
     // Late resources
     #[resources]

examples/t-binds.rs

@@ -17,18 +17,18 @@ mod app {
     // Cortex-M exception
     #[task(binds = SVCall)]
     fn foo(c: foo::Context) {
-        foo_trampoline(c)
+        crate::foo_trampoline(c)
     }
 
     // LM3S6965 interrupt
     #[task(binds = UART0)]
     fn bar(c: bar::Context) {
-        bar_trampoline(c)
+        crate::bar_trampoline(c)
     }
 }
 
 #[allow(dead_code)]
-fn foo_trampoline(_: foo::Context) {}
+fn foo_trampoline(_: app::foo::Context) {}
 
 #[allow(dead_code)]
-fn bar_trampoline(_: bar::Context) {}
+fn bar_trampoline(_: app::bar::Context) {}

examples/t-htask-main.rs

@@ -3,11 +3,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::debug;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(lm3s6965::Interrupt::UART0);

examples/t-idle-main.rs

@@ -3,11 +3,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::debug;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         init::LateResources {}

examples/t-init-main.rs

@@ -3,11 +3,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::debug;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         debug::exit(debug::EXIT_SUCCESS);

examples/t-late-not-send.rs

@@ -14,6 +14,7 @@ pub struct NotSend {
 #[rtic::app(device = lm3s6965)]
 mod app {
     use super::NotSend;
+    use core::marker::PhantomData;
 
     #[resources]
     struct Resources {

examples/t-schedule.rs

@@ -6,10 +6,11 @@
 #![no_std]
 
 use panic_halt as _;
-use rtic::cyccnt::{Instant, U32Ext as _};
 
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
 mod app {
+    use rtic::cyccnt::{Instant, U32Ext as _};
+
     #[init]
     fn init(c: init::Context) -> init::LateResources {
         let _: Result<(), ()> = foo::schedule(c.start + 10.cycles());

examples/t-stask-main.rs

@@ -3,11 +3,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::debug;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         taskmain::spawn().ok();

examples/task-local-minimal.rs

@@ -4,11 +4,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[resources]
     struct Resources {
         // A local (move), late resource

examples/task-local.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
-use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+    use lm3s6965::Interrupt;
+
     #[resources]
     struct Resources {
         // An early resource

examples/task.rs

@@ -5,11 +5,12 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
 mod app {
+    use cortex_m_semihosting::{debug, hprintln};
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         foo::spawn().unwrap();

examples/types.rs

@@ -5,12 +5,13 @@
 #![no_main]
 #![no_std]
 
-use cortex_m_semihosting::debug;
 use panic_semihosting as _;
-use rtic::cyccnt;
 
 #[rtic::app(device = lm3s6965, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
 mod app {
+    use cortex_m_semihosting::debug;
+    use rtic::cyccnt;
+
     #[resources]
     struct Resources {
         #[init(0)]

macros/src/codegen.rs

@@ -22,35 +22,20 @@ mod util;
 // TODO document the syntax here or in `rtic-syntax`
 pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
     let mut mod_app = vec![];
-    let mut mod_app_imports = vec![];
     let mut mains = vec![];
     let mut root = vec![];
     let mut user = vec![];
-    let mut imports = vec![];
 
     // Generate the `main` function
     let assertion_stmts = assertions::codegen(analysis);
 
     let pre_init_stmts = pre_init::codegen(&app, analysis, extra);
 
-    let (mod_app_init, root_init, user_init, user_init_imports, call_init) =
+    let (mod_app_init, root_init, user_init, call_init) = init::codegen(app, analysis, extra);
-        init::codegen(app, analysis, extra);
 
     let post_init_stmts = post_init::codegen(&app, analysis);
 
-    let (mod_app_idle, root_idle, user_idle, user_idle_imports, call_idle) =
+    let (mod_app_idle, root_idle, user_idle, call_idle) = idle::codegen(app, analysis, extra);
-        idle::codegen(app, analysis, extra);
-
-    if user_init.is_some() {
-        mod_app_imports.push(quote!(
-            use super::init;
-        ))
-    }
-    if user_idle.is_some() {
-        mod_app_imports.push(quote!(
-            use super::idle;
-        ))
-    }
 
     user.push(quote!(
         #user_init
@@ -58,11 +43,6 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
         #user_idle
     ));
 
-    imports.push(quote!(
-        #(#user_init_imports)*
-        #(#user_idle_imports)*
-    ));
-
     root.push(quote!(
         #(#root_init)*
 
@@ -93,22 +73,13 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
         }
     ));
 
-    let (mod_app_resources, mod_resources, mod_resources_imports) =
+    let (mod_app_resources, mod_resources) = resources::codegen(app, analysis, extra);
-        resources::codegen(app, analysis, extra);
 
-    let (
+    let (mod_app_hardware_tasks, root_hardware_tasks, user_hardware_tasks) =
-        mod_app_hardware_tasks,
+        hardware_tasks::codegen(app, analysis, extra);
-        root_hardware_tasks,
-        user_hardware_tasks,
-        user_hardware_tasks_imports,
-    ) = hardware_tasks::codegen(app, analysis, extra);
 
-    let (
+    let (mod_app_software_tasks, root_software_tasks, user_software_tasks) =
-        mod_app_software_tasks,
+        software_tasks::codegen(app, analysis, extra);
-        root_software_tasks,
-        user_software_tasks,
-        user_software_tasks_imports,
-    ) = software_tasks::codegen(app, analysis, extra);
 
     let mod_app_dispatchers = dispatchers::codegen(app, analysis, extra);
     let mod_app_timer_queue = timer_queue::codegen(app, analysis, extra);
@@ -122,15 +93,28 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
     let task_list = analysis.tasks.clone();
 
     let mut tasks = vec![];
+
     if !task_list.is_empty() {
         tasks.push(quote!(
-            enum Tasks {
+            #[allow(non_camel_case_types)]
+            pub enum Tasks {
                 #(#task_list),*
             }
         ));
     }
 
     quote!(
+        /// Implementation details
+        pub mod #name {
+            /// Always include the device crate which contains the vector table
+            use #device as you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml;
+
+            #(#user_imports)*
+
+            /// User code from within the module
+            #(#user_code)*
+            /// User code end
+
             #(#user)*
 
             #(#user_hardware_tasks)*
@@ -148,24 +132,6 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
             /// Unused
             #(#tasks)*
 
-        /// Implementation details
-        mod #name {
-            /// Always include the device crate which contains the vector table
-            use #device as you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml;
-            #(#imports)*
-            #(#user_imports)*
-
-            /// User code from within the module
-            #(#user_code)*
-            /// User code end
-
-
-            #(#user_hardware_tasks_imports)*
-
-            #(#user_software_tasks_imports)*
-
-            #(#mod_resources_imports)*
-
             /// app module
             #(#mod_app)*
 

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)*

macros/src/codegen/hardware_tasks.rs

@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
 use rtic_syntax::{ast::App, Context};
 
 use crate::{
@@ -23,13 +23,10 @@ pub fn codegen(
     Vec<TokenStream2>,
     // user_hardware_tasks -- the `#[task]` functions written by the user
     Vec<TokenStream2>,
-    // user_hardware_tasks_imports -- the imports for `#[task]` functions written by the user
-    Vec<TokenStream2>,
 ) {
     let mut mod_app = vec![];
     let mut root = vec![];
     let mut user_tasks = vec![];
-    let mut hardware_tasks_imports = vec![];
 
     for (name, task) in &app.hardware_tasks {
         let (let_instant, instant) = if let Some(m) = extra.monotonic {
@@ -50,6 +47,8 @@ pub fn codegen(
         let symbol = task.args.binds.clone();
         let priority = task.args.priority;
 
+        let app_name = &app.name;
+        let app_path = quote! {crate::#app_name};
         mod_app.push(quote!(
             #[allow(non_snake_case)]
             #[no_mangle]
@@ -59,7 +58,7 @@ pub fn codegen(
                 #let_instant
 
                 rtic::export::run(PRIORITY, || {
-                    crate::#name(
+                    #app_path::#name(
                         #locals_new
                         #name::Context::new(&rtic::export::Priority::new(PRIORITY) #instant)
                     )
@@ -79,13 +78,6 @@ pub fn codegen(
                 analysis,
             );
 
-            // Add resources to imports
-            let name_res = format_ident!("{}Resources", name);
-            hardware_tasks_imports.push(quote!(
-                #[allow(non_snake_case)]
-                use super::#name_res;
-            ));
-
             root.push(item);
 
             mod_app.push(constructor);
@@ -121,13 +113,7 @@ pub fn codegen(
                 #(#stmts)*
             }
         ));
-
-        hardware_tasks_imports.push(quote!(
-            #(#attrs)*
-            #[allow(non_snake_case)]
-            use super::#name;
-        ));
     }
 
-    (mod_app, root, user_tasks, hardware_tasks_imports)
+    (mod_app, root, user_tasks)
 }

macros/src/codegen/idle.rs

@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
 use rtic_syntax::{ast::App, Context};
 
 use crate::{
@@ -23,8 +23,6 @@ pub fn codegen(
     Vec<TokenStream2>,
     // user_idle
     Option<TokenStream2>,
-    // user_idle_imports
-    Vec<TokenStream2>,
     // call_idle
     TokenStream2,
 ) {
@@ -36,8 +34,6 @@ pub fn codegen(
         let mut locals_pat = None;
         let mut locals_new = None;
 
-        let mut user_idle_imports = vec![];
-
         let name = &idle.name;
 
         if !idle.args.resources.is_empty() {
@@ -46,12 +42,6 @@ pub fn codegen(
 
             root_idle.push(item);
             mod_app = Some(constructor);
-
-            let name_resource = format_ident!("{}Resources", name);
-            user_idle_imports.push(quote!(
-                    #[allow(non_snake_case)]
-                    use super::#name_resource;
-            ));
         }
 
         if !idle.locals.is_empty() {
@@ -83,25 +73,21 @@ pub fn codegen(
                 #(#stmts)*
             }
         ));
-        user_idle_imports.push(quote!(
-            #(#attrs)*
-            #[allow(non_snake_case)]
-            use super::#name;
-        ));
 
+        let app_name = &app.name;
+        let app_path = quote! {crate::#app_name};
         let locals_new = locals_new.iter();
-        let call_idle = quote!(crate::#name(
+        let call_idle = quote!(#app_path::#name(
             #(#locals_new,)*
             #name::Context::new(&rtic::export::Priority::new(0))
         ));
 
-        (mod_app, root_idle, user_idle, user_idle_imports, call_idle)
+        (mod_app, root_idle, user_idle, call_idle)
     } else {
         (
             None,
             vec![],
             None,
-            vec![],
             quote!(loop {
                 rtic::export::wfi()
             }),

macros/src/codegen/init.rs

@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
 use rtic_syntax::{ast::App, Context};
 
 use crate::{
@@ -19,8 +19,6 @@ type CodegenResult = (
     Vec<TokenStream2>,
     // user_init -- the `#[init]` function written by the user
     Option<TokenStream2>,
-    // user_init_imports -- the imports for `#[init]` functio written by the user
-    Vec<TokenStream2>,
     // call_init -- the call to the user `#[init]` if there's one
     Option<TokenStream2>,
 );
@@ -50,7 +48,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
             })
             .collect::<Vec<_>>();
 
-        let mut user_init_imports = vec![];
         let late_resources = util::late_resources_ident(&name);
 
         root_init.push(quote!(
@@ -61,12 +58,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
             }
         ));
 
-        let name_late = format_ident!("{}LateResources", name);
-        user_init_imports.push(quote!(
-                #[allow(non_snake_case)]
-                use super::#name_late;
-        ));
-
         let mut locals_pat = None;
         let mut locals_new = None;
         if !init.locals.is_empty() {
@@ -88,11 +79,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
                 #(#stmts)*
             }
         ));
-        user_init_imports.push(quote!(
-                #(#attrs)*
-                #[allow(non_snake_case)]
-                use super::#name;
-        ));
 
         let mut mod_app = None;
         if !init.args.resources.is_empty() {
@@ -101,17 +87,13 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
 
             root_init.push(item);
             mod_app = Some(constructor);
-
-            let name_late = format_ident!("{}Resources", name);
-            user_init_imports.push(quote!(
-                    #[allow(non_snake_case)]
-                    use super::#name_late;
-            ));
         }
 
+        let app_name = &app.name;
+        let app_path = quote! {crate::#app_name};
         let locals_new = locals_new.iter();
         let call_init = Some(
-            quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));),
+            quote!(let late = #app_path::#name(#(#locals_new,)* #name::Context::new(core.into()));),
         );
 
         root_init.push(module::codegen(
@@ -122,8 +104,8 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
             extra,
         ));
 
-        (mod_app, root_init, user_init, user_init_imports, call_init)
+        (mod_app, root_init, user_init, call_init)
     } else {
-        (None, vec![], None, vec![], None)
+        (None, vec![], None, None)
     }
 }

macros/src/codegen/post_init.rs

@@ -2,7 +2,7 @@ use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 use rtic_syntax::ast::App;
 
-use crate::analyze::Analysis;
+use crate::{analyze::Analysis, codegen::util};
 
 /// Generates code that runs after `#[init]` returns
 pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
@@ -12,13 +12,14 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
     if !analysis.late_resources.is_empty() {
         // BTreeSet wrapped in a vector
         for name in analysis.late_resources.first().unwrap() {
+            let mangled_name = util::mangle_ident(&name);
             // If it's live
             let cfgs = app.late_resources[name].cfgs.clone();
             if analysis.locations.get(name).is_some() {
                 // Need to also include the cfgs
                 stmts.push(quote!(
                 #(#cfgs)*
-                #name.as_mut_ptr().write(late.#name);
+                #mangled_name.as_mut_ptr().write(late.#name);
                 ));
             }
         }

macros/src/codegen/resources.rs

@@ -14,16 +14,14 @@ pub fn codegen(
     Vec<TokenStream2>,
     // mod_resources -- the `resources` module
     TokenStream2,
-    // mod_resources_imports -- the `resources` module imports
-    Vec<TokenStream2>,
 ) {
     let mut mod_app = vec![];
     let mut mod_resources = vec![];
-    let mut mod_resources_imports = vec![];
 
     for (name, res, expr, _) in app.resources(analysis) {
         let cfgs = &res.cfgs;
         let ty = &res.ty;
+        let mangled_name = util::mangle_ident(&name);
 
         {
             let section = if expr.is_none() {
@@ -47,7 +45,7 @@ pub fn codegen(
                 #(#attrs)*
                 #(#cfgs)*
                 #section
-                static mut #name: #ty = #expr;
+                static mut #mangled_name: #ty = #expr;
             ));
         }
 
@@ -76,21 +74,15 @@ pub fn codegen(
             let ptr = if expr.is_none() {
                 quote!(
                     #(#cfgs)*
-                    #name.as_mut_ptr()
+                    #mangled_name.as_mut_ptr()
                 )
             } else {
                 quote!(
                     #(#cfgs)*
-                    &mut #name
+                    &mut #mangled_name
                 )
             };
 
-            mod_resources_imports.push(quote!(
-                #[allow(non_camel_case_types)]
-                #(#cfgs)*
-                use super::resources::#name;
-            ));
-
             mod_app.push(util::impl_mutex(
                 extra,
                 cfgs,
@@ -106,11 +98,6 @@ pub fn codegen(
     let mod_resources = if mod_resources.is_empty() {
         quote!()
     } else {
-        // Also import the resource module
-        mod_resources_imports.push(quote!(
-            use super::resources;
-        ));
-
         quote!(mod resources {
             use rtic::export::Priority;
 
@@ -118,5 +105,5 @@ pub fn codegen(
         })
     };
 
-    (mod_app, mod_resources, mod_resources_imports)
+    (mod_app, mod_resources)
 }

macros/src/codegen/resources_struct.rs

@@ -36,6 +36,7 @@ pub fn codegen(
             None
         };
         let ty = &res.ty;
+        let mangled_name = util::mangle_ident(&name);
 
         if ctxt.is_init() {
             if !analysis.ownerships.contains_key(name) {
@@ -47,7 +48,7 @@ pub fn codegen(
 
                 values.push(quote!(
                     #(#cfgs)*
-                    #name: &#mut_ #name
+                    #name: &#mut_ #mangled_name
                 ));
             } else {
                 // Owned by someone else
@@ -60,7 +61,7 @@ pub fn codegen(
 
                 values.push(quote!(
                     #(#cfgs)*
-                    #name: &mut #name
+                    #name: &mut #mangled_name
                 ));
             }
         } else {
@@ -115,9 +116,9 @@ pub fn codegen(
             let is_late = expr.is_none();
             if is_late {
                 let expr = if mut_.is_some() {
-                    quote!(&mut *#name.as_mut_ptr())
+                    quote!(&mut *#mangled_name.as_mut_ptr())
                 } else {
-                    quote!(&*#name.as_ptr())
+                    quote!(&*#mangled_name.as_ptr())
                 };
 
                 values.push(quote!(
@@ -127,7 +128,7 @@ pub fn codegen(
             } else {
                 values.push(quote!(
                     #(#cfgs)*
-                    #name: &#mut_ #name
+                    #name: &#mut_ #mangled_name
                 ));
             }
         }

macros/src/codegen/software_tasks.rs

@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
 use rtic_syntax::{ast::App, Context};
 
 use crate::{
@@ -22,13 +22,10 @@ pub fn codegen(
     Vec<TokenStream2>,
     // user_software_tasks -- the `#[task]` functions written by the user
     Vec<TokenStream2>,
-    // user_software_tasks_imports -- the imports for `#[task]` functions written by the user
-    Vec<TokenStream2>,
 ) {
     let mut mod_app = vec![];
     let mut root = vec![];
     let mut user_tasks = vec![];
-    let mut software_tasks_imports = vec![];
 
     for (name, task) in &app.software_tasks {
         let inputs = &task.inputs;
@@ -53,7 +50,7 @@ pub fn codegen(
         mod_app.push(quote!(
             /// Queue version of a free-list that keeps track of empty slots in
             /// the following buffers
-            pub static mut #fq: #fq_ty = #fq_expr;
+            static mut #fq: #fq_ty = #fq_expr;
         ));
 
         let elems = &(0..cap)
@@ -67,7 +64,7 @@ pub fn codegen(
             mod_app.push(quote!(
                 #uninit
                 /// Buffer that holds the instants associated to the inputs of a task
-                pub static mut #instants:
+                static mut #instants:
                     [core::mem::MaybeUninit<<#m as rtic::Monotonic>::Instant>; #cap_lit] =
                     [#(#elems,)*];
             ));
@@ -78,7 +75,7 @@ pub fn codegen(
         mod_app.push(quote!(
             #uninit
             /// Buffer that holds the inputs of a task
-            pub static mut #inputs_ident: [core::mem::MaybeUninit<#input_ty>; #cap_lit] =
+            static mut #inputs_ident: [core::mem::MaybeUninit<#input_ty>; #cap_lit] =
                 [#(#elems,)*];
         ));
 
@@ -93,13 +90,6 @@ pub fn codegen(
                 analysis,
             );
 
-            // Add resources to imports
-            let name_res = format_ident!("{}Resources", name);
-            software_tasks_imports.push(quote!(
-                #[allow(non_snake_case)]
-                use super::#name_res;
-            ));
-
             root.push(item);
 
             mod_app.push(constructor);
@@ -123,17 +113,12 @@ pub fn codegen(
             #(#attrs)*
             #(#cfgs)*
             #[allow(non_snake_case)]
-            pub fn #name(#(#locals_pat,)* #context: #name::Context #(,#inputs)*) {
+            fn #name(#(#locals_pat,)* #context: #name::Context #(,#inputs)*) {
                 use rtic::Mutex as _;
 
                 #(#stmts)*
             }
         ));
-        software_tasks_imports.push(quote!(
-            #(#cfgs)*
-            #[allow(non_snake_case)]
-            use super::#name;
-        ));
 
         root.push(module::codegen(
             Context::SoftwareTask(name),
@@ -144,5 +129,5 @@ pub fn codegen(
         ));
     }
 
-    (mod_app, root, user_tasks, software_tasks_imports)
+    (mod_app, root, user_tasks)
 }

macros/src/codegen/timer_queue.rs

@@ -31,7 +31,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
                 #[doc = #doc]
                 #[allow(non_camel_case_types)]
                 #[derive(Clone, Copy)]
-                pub enum #t {
+                enum #t {
                     #(#variants,)*
                 }
             ));
@@ -52,7 +52,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
 
             items.push(quote!(
                 #[doc = #doc]
-                pub static mut #tq: #tq_ty = rtic::export::TimerQueue(
+                static mut #tq: #tq_ty = rtic::export::TimerQueue(
                     rtic::export::BinaryHeap(
                         rtic::export::iBinaryHeap::new()
                     )

macros/src/codegen/util.rs

@@ -53,7 +53,7 @@ pub fn impl_mutex(
             type T = #ty;
 
             #[inline(always)]
-            fn lock<R>(&mut self, f: impl FnOnce(&mut #ty) -> R) -> R {
+            fn lock<RTIC_INTERNAL_R>(&mut self, f: impl FnOnce(&mut #ty) -> RTIC_INTERNAL_R) -> RTIC_INTERNAL_R {
                 /// Priority ceiling
                 const CEILING: u8 = #ceiling;
 
@@ -111,6 +111,14 @@ pub fn late_resources_ident(init: &Ident) -> Ident {
     )
 }
 
+/// Mangle an ident
+pub fn mangle_ident(ident: &Ident) -> Ident {
+    Ident::new(
+        &format!("__rtic_internal_{}", ident.to_string()),
+        Span::call_site(),
+    )
+}
+
 fn link_section_index() -> usize {
     static INDEX: AtomicUsize = AtomicUsize::new(0);
 

ui/single/resources-cfg.stderr

@@ -4,7 +4,7 @@ error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `p
   = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-f14aca24435a5414.rlib
   = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.rmeta
 
-error[E0609]: no field `o1` on type `initResources<'_>`
+error[E0609]: no field `o1` on type `app::initResources<'_>`
   --> $DIR/resources-cfg.rs:47:21
    |
 47 |         c.resources.o1;
@@ -12,7 +12,7 @@ error[E0609]: no field `o1` on type `initResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `o4` on type `initResources<'_>`
+error[E0609]: no field `o4` on type `app::initResources<'_>`
   --> $DIR/resources-cfg.rs:48:21
    |
 48 |         c.resources.o4;
@@ -20,7 +20,7 @@ error[E0609]: no field `o4` on type `initResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `o5` on type `initResources<'_>`
+error[E0609]: no field `o5` on type `app::initResources<'_>`
   --> $DIR/resources-cfg.rs:49:21
    |
 49 |         c.resources.o5;
@@ -28,7 +28,7 @@ error[E0609]: no field `o5` on type `initResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `o6` on type `initResources<'_>`
+error[E0609]: no field `o6` on type `app::initResources<'_>`
   --> $DIR/resources-cfg.rs:50:21
    |
 50 |         c.resources.o6;
@@ -36,7 +36,7 @@ error[E0609]: no field `o6` on type `initResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `s3` on type `initResources<'_>`
+error[E0609]: no field `s3` on type `app::initResources<'_>`
   --> $DIR/resources-cfg.rs:51:21
    |
 51 |         c.resources.s3;
@@ -44,7 +44,7 @@ error[E0609]: no field `s3` on type `initResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `o2` on type `idleResources<'_>`
+error[E0609]: no field `o2` on type `app::idleResources<'_>`
   --> $DIR/resources-cfg.rs:58:21
    |
 58 |         c.resources.o2;
@@ -52,7 +52,7 @@ error[E0609]: no field `o2` on type `idleResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `o4` on type `idleResources<'_>`
+error[E0609]: no field `o4` on type `app::idleResources<'_>`
   --> $DIR/resources-cfg.rs:59:21
    |
 59 |         c.resources.o4;
@@ -60,7 +60,7 @@ error[E0609]: no field `o4` on type `idleResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `s1` on type `idleResources<'_>`
+error[E0609]: no field `s1` on type `app::idleResources<'_>`
   --> $DIR/resources-cfg.rs:60:21
    |
 60 |         c.resources.s1;
@@ -68,7 +68,7 @@ error[E0609]: no field `s1` on type `idleResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `s3` on type `idleResources<'_>`
+error[E0609]: no field `s3` on type `app::idleResources<'_>`
   --> $DIR/resources-cfg.rs:61:21
    |
 61 |         c.resources.s3;
@@ -76,7 +76,7 @@ error[E0609]: no field `s3` on type `idleResources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `o3` on type `uart0Resources<'_>`
+error[E0609]: no field `o3` on type `app::uart0Resources<'_>`
   --> $DIR/resources-cfg.rs:68:21
    |
 68 |         c.resources.o3;
@@ -84,7 +84,7 @@ error[E0609]: no field `o3` on type `uart0Resources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `s1` on type `uart0Resources<'_>`
+error[E0609]: no field `s1` on type `app::uart0Resources<'_>`
   --> $DIR/resources-cfg.rs:69:21
    |
 69 |         c.resources.s1;
@@ -92,7 +92,7 @@ error[E0609]: no field `s1` on type `uart0Resources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `s2` on type `uart0Resources<'_>`
+error[E0609]: no field `s2` on type `app::uart0Resources<'_>`
   --> $DIR/resources-cfg.rs:70:21
    |
 70 |         c.resources.s2;
@@ -100,7 +100,7 @@ error[E0609]: no field `s2` on type `uart0Resources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `s3` on type `uart0Resources<'_>`
+error[E0609]: no field `s3` on type `app::uart0Resources<'_>`
   --> $DIR/resources-cfg.rs:71:21
    |
 71 |         c.resources.s3;
@@ -108,7 +108,7 @@ error[E0609]: no field `s3` on type `uart0Resources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `s2` on type `uart1Resources<'_>`
+error[E0609]: no field `s2` on type `app::uart1Resources<'_>`
   --> $DIR/resources-cfg.rs:76:21
    |
 76 |         c.resources.s2;
@@ -116,7 +116,7 @@ error[E0609]: no field `s2` on type `uart1Resources<'_>`
    |
    = note: available fields are: `__marker__`
 
-error[E0609]: no field `o5` on type `uart1Resources<'_>`
+error[E0609]: no field `o5` on type `app::uart1Resources<'_>`
   --> $DIR/resources-cfg.rs:77:21
    |
 77 |         c.resources.o5;