CI problem fixed

rtic-rs · Feb 5, 2022 · fde331f · fde331f
1 parent 3a24fd8
commit fde331f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/ci/expected/lockall.run b/ci/expected/lockall.run
@@ -1,5 +1,3 @@
 foo: a = 1, b = 2
 baz
-still in foo::lock
 bar: a = 3
-still in foo
diff --git a/ci/expected/lockall_destcruct.run → ci/expected/lockall_destruct.run b/ci/expected/lockall_destcruct.run → ci/expected/lockall_destruct.run
@@ -1,5 +1,3 @@
 foo: a = 1, b = 2
 baz
-still in foo::lock
 bar: a = 3
-still in foo
diff --git a/examples/lockall.rs b/examples/lockall.rs
@@ -35,9 +35,7 @@ mod app {
             *s.a += 1;
             bar::spawn().unwrap();
             baz::spawn().unwrap();
-            hprintln!("still in foo::lock").ok();
         });
-        hprintln!("still in foo").ok();
         debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
     }
 

diff --git a/examples/lockall_destruct.rs b/examples/lockall_destruct.rs
@@ -35,19 +35,17 @@ mod app {
             **a += 1;
             bar::spawn().unwrap();
             baz::spawn().unwrap();
-            hprintln!("still in foo::lock").ok();
         });
-        hprintln!("still in foo").ok();
         debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
     }
 
     #[task(priority = 2, shared = [a])]
     fn bar(mut c: bar::Context) {
         // the higher priority task does still need a critical section
-        let a = c.shared.lock(|s| {
-            *s.a += 1;
+        let a = c.shared.lock(|bar::Shared { a }| {
+            **a += 1;
             // *s.b += 1; `b` not accessible
-            *s.a
+            **a
         });
 
         hprintln!("bar: a = {}", a).unwrap();