Merge branch 'master'

of https://github.com/rtic-rs/cortex-m-rtic

1 files changed, 8 insertions, 6 deletions

diff --git a/examples/t-stask-main.rs b/examples/t-stask-main.rs
index f2709404..74335c18 100644
--- a/examples/t-stask-main.rs
+++ b/examples/t-stask-main.rs
@@ -7,14 +7,16 @@ use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
-    #[init(spawn = [main])]
-    fn init(cx: init::Context) {
-        cx.spawn.main().ok();
+mod app {
+    #[init(spawn = [taskmain])]
+    fn init(cx: init::Context) -> init::LateResources {
+        cx.spawn.taskmain().ok();
+
+        init::LateResources {}
     }
 
     #[task]
-    fn main(_: main::Context) {
+    fn taskmain(_: taskmain::Context) {
         debug::exit(debug::EXIT_SUCCESS);
     }
 
@@ -24,4 +26,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}