From eea803008390cbae307e873ce6d39e01d6367759 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 21 Apr 2017 21:24:28 -0500 Subject: reword the comments in compile-fail tests --- tests/cfail/lock.rs | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'tests/cfail/lock.rs') diff --git a/tests/cfail/lock.rs b/tests/cfail/lock.rs index 36541f2..ca4ea73 100644 --- a/tests/cfail/lock.rs +++ b/tests/cfail/lock.rs @@ -4,17 +4,16 @@ use rtfm::{C16, C2, P1, P16, P2, P3, Resource}; static R1: Resource = Resource::new(0); -// You CAN'T lock a resource with ceiling C from a task with priority P if P > C +// You CAN'T use `raise` to lower the system ceiling fn j1(prio: P3) { let ceil = prio.as_ceiling(); - ceil.raise(&R1, |ceil| { - //~^ error - }); + ceil.raise(&R1, |ceil| {}); + //~^ error } -// DON'T lock a resource with ceiling equal to the task priority. -// Instead use `borrow` +// You don't need to raise the ceiling to access a resource with ceiling equal +// to the task priority. fn j2(prio: P2) { let ceil = prio.as_ceiling(); @@ -25,28 +24,26 @@ fn j2(prio: P2) { let r1 = R1.borrow(&prio, ceil); } -// You CAN lock a resource with ceiling C from a task with priority P if C > P +// You CAN access a resource with ceiling C from a task with priority P if C > P +// and you raise the ceiling first fn j3(prio: P1) { let ceil = prio.as_ceiling(); // OK - ceil.raise(&R1, |ceil| { - let r1 = R1.borrow(&prio, ceil); - }) + ceil.raise(&R1, |ceil| { let r1 = R1.borrow(&prio, ceil); }) } static R2: Resource = Resource::new(0); -// Tasks with priority less than P16 can't lock a resource with ceiling C16 +// Tasks with priority less than P16 can't access a resource with ceiling C16 fn j4(prio: P1) { let ceil = prio.as_ceiling(); - ceil.raise(&R2, |ceil| { - //~^ error - }); + ceil.raise(&R2, |ceil| {}); + //~^ error } -// Only tasks with priority P16 can claim a resource with ceiling C16 +// Only tasks with priority P16 can access a resource with ceiling C16 fn j5(prio: P16) { // OK let r2 = R2.borrow(&prio, prio.as_ceiling()); -- cgit v1.2.3