From e2bde8d21acdfb845554d960536bfb94a7bb1f86 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 27 Apr 2017 19:06:22 -0500
Subject: make the ceiling part of the task signature

remove the P.as_ceiling method
---
 tests/cfail/tasks-p0.rs | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'tests/cfail/tasks-p0.rs')

diff --git a/tests/cfail/tasks-p0.rs b/tests/cfail/tasks-p0.rs
index 521db54..4034f62 100644
--- a/tests/cfail/tasks-p0.rs
+++ b/tests/cfail/tasks-p0.rs
@@ -1,11 +1,11 @@
-// error-pattern: type mismatch
+// error-pattern: expected struct `typenum::Equal`, found struct `typenum::Greater`
 
 #![feature(used)]
 
 #[macro_use]
 extern crate cortex_m_rtfm as rtfm;
 
-use rtfm::{C16, P0, P1};
+use rtfm::{C0, C1, C16, P0, P1};
 use device::interrupt::Exti0;
 
 // WRONG: Tasks can't have a priority of 0.
@@ -20,11 +20,11 @@ tasks!(device, {
 
 fn init(_: P0, _: &C16) {}
 
-fn idle(_: P0) -> ! {
+fn idle(_: P0, _: C0) -> ! {
     loop {}
 }
 
-fn j1(_task: Exti0, _prio: P1) {}
+fn j1(_task: Exti0, _prio: P1, _ceil: C1) {}
 
 // fake device crate
 extern crate core;
@@ -32,6 +32,7 @@ extern crate cortex_m;
 
 mod device {
     pub mod interrupt {
+        use cortex_m::ctxt::Context;
         use cortex_m::interrupt::Nr;
 
         extern "C" fn default_handler<T>(_: T) {}
@@ -39,14 +40,17 @@ mod device {
         pub struct Handlers {
             pub Exti0: extern "C" fn(Exti0),
             pub Exti1: extern "C" fn(Exti1),
+            pub Exti2: extern "C" fn(Exti2),
         }
 
         pub struct Exti0;
         pub struct Exti1;
+        pub struct Exti2;
 
         pub enum Interrupt {
             Exti0,
             Exti1,
+            Exti2,
         }
 
         unsafe impl Nr for Interrupt {
@@ -55,9 +59,34 @@ mod device {
             }
         }
 
+        unsafe impl Context for Exti0 {}
+
+        unsafe impl Nr for Exti0 {
+            fn nr(&self) -> u8 {
+                0
+            }
+        }
+
+        unsafe impl Context for Exti1 {}
+
+        unsafe impl Nr for Exti1 {
+            fn nr(&self) -> u8 {
+                0
+            }
+        }
+
+        unsafe impl Context for Exti2 {}
+
+        unsafe impl Nr for Exti2 {
+            fn nr(&self) -> u8 {
+                0
+            }
+        }
+
         pub const DEFAULT_HANDLERS: Handlers = Handlers {
             Exti0: default_handler,
             Exti1: default_handler,
+            Exti2: default_handler,
         };
     }
 }
-- 
cgit v1.2.3