From a6dd004113fcbc03ffacacc519d742ee84886c1d Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 9 Dec 2017 14:43:29 +0100 Subject: implement the Resource trait for owned resources this unbreaks the "generics" example --- tests/cfail/lock.rs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'tests/cfail/lock.rs') diff --git a/tests/cfail/lock.rs b/tests/cfail/lock.rs index 5630649..eb03b7d 100644 --- a/tests/cfail/lock.rs +++ b/tests/cfail/lock.rs @@ -45,22 +45,24 @@ fn idle() -> ! { } fn exti0(mut t: &mut Threshold, mut r: EXTI0::Resources) { + // ERROR need to lock to access the resource because priority < ceiling + if *r.ON { + //~^ error type `EXTI0::ON` cannot be dereferenced + } + // OK need to lock to access the resource - if r.ON.claim(&mut t, |on, _| **on) {} + if r.ON.claim(&mut t, |on, _| *on) {} // OK can claim a resource with maximum ceiling - r.MAX.claim_mut(&mut t, |max, _| **max += 1); + r.MAX.claim_mut(&mut t, |max, _| *max += 1); } fn exti1(mut t: &mut Threshold, r: EXTI1::Resources) { - // ERROR no need to lock. Has direct access because priority == ceiling - if (**r.ON).claim(&mut t, |on, _| **on) { - //~^ error no method named `claim` found for type - } + // OK to directly access the resource because priority == ceiling + if *r.ON {} - if **r.ON { - // OK - } + // though the resource can still be claimed -- the claim is a no-op + if r.ON.claim(&mut t, |on, _| *on) {} } fn exti2(_t: &mut Threshold, _r: EXTI2::Resources) {} -- cgit v1.2.3