From aa2249454975a203e459597005944f5370c1d200 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 27 Jul 2017 11:40:15 -0500
Subject: update tests and examples

with task! gone 3 types of errors / gotchas have been eliminated :tada:
---
 tests/cfail/critical-section.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'tests/cfail/critical-section.rs')

diff --git a/tests/cfail/critical-section.rs b/tests/cfail/critical-section.rs
index 3c8f0a9..7e73fd3 100644
--- a/tests/cfail/critical-section.rs
+++ b/tests/cfail/critical-section.rs
@@ -3,7 +3,6 @@
 #![feature(proc_macro)]
 #![no_std]
 
-#[macro_use(task)]
 extern crate cortex_m_rtfm as rtfm;
 extern crate stm32f103xx;
 
@@ -13,18 +12,19 @@ app! {
     device: stm32f103xx,
 
     resources: {
-        static STATE: bool = false;
+        static ON: bool = false;
     },
 
     idle: {
-        resources: [STATE],
+        resources: [ON],
     },
 
     tasks: {
         EXTI0: {
             enabled: true,
+            path: exti0,
             priority: 1,
-            resources: [STATE],
+            resources: [ON],
         },
     },
 }
@@ -32,12 +32,12 @@ app! {
 fn init(_p: init::Peripherals, _r: init::Resources) {}
 
 fn idle(t: &mut Threshold, r: idle::Resources) -> ! {
-    let state = rtfm::atomic(|cs| {
+    let state = rtfm::atomic(t, |t| {
         // ERROR borrow can't escape this *global* critical section
-        r.STATE.borrow(cs) //~ error cannot infer an appropriate lifetime
+        r.ON.borrow(t) //~ error cannot infer an appropriate lifetime
     });
 
-    let state = r.STATE.claim(t, |state, _t| {
+    let state = r.ON.claim(t, |state, _t| {
         // ERROR borrow can't escape this critical section
         state //~ error cannot infer an appropriate lifetime
     });
@@ -45,6 +45,4 @@ fn idle(t: &mut Threshold, r: idle::Resources) -> ! {
     loop {}
 }
 
-task!(EXTI0, exti0);
-
 fn exti0(_t: &mut Threshold, _r: EXTI0::Resources) {}
-- 
cgit v1.2.3