Fix tests.

reitermarkus · reitermarkus · commit 53c40eb6ee97 · 2022-05-05T16:01:29.000+02:00
diff --git a/cortex-m-rt/examples/divergent-default-handler.rs b/cortex-m-rt/examples/divergent-default-handler.rs
@@ -2,9 +2,9 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception};
 
 #[entry]
@@ -13,6 +13,6 @@ fn foo() -> ! {
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irqn: i16) -> ! {
+unsafe fn DefaultHandler(_: Vector) -> ! {
     loop {}
 }
diff --git a/cortex-m-rt/examples/override-exception.rs b/cortex-m-rt/examples/override-exception.rs
@@ -4,20 +4,18 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
 extern crate panic_halt;
 
-use cortex_m::asm;
-use rt::{entry, exception, ExceptionFrame};
+use cortex_m::{asm, peripheral::scb::Vector};
+use cortex_m_rt::{entry, exception, ExceptionFrame};
 
 #[entry]
 fn main() -> ! {
     loop {}
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irqn: i16) {
+unsafe fn DefaultHandler(_: Vector) {
     asm::bkpt();
 }
 
diff --git a/cortex-m-rt/examples/unsafe-default-handler.rs b/cortex-m-rt/examples/unsafe-default-handler.rs
@@ -2,9 +2,9 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception};
 
 #[entry]
@@ -13,4 +13,4 @@ fn foo() -> ! {
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irqn: i16) {}
+unsafe fn DefaultHandler(_: Vector) {}
diff --git a/cortex-m-rt/examples/unsafety.rs b/cortex-m-rt/examples/unsafety.rs
@@ -4,9 +4,9 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 
 #[entry]
@@ -17,7 +17,7 @@ unsafe fn main() -> ! {
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irqn: i16) {
+unsafe fn DefaultHandler(_: Vector) {
     foo();
 }
 
diff --git a/cortex-m-rt/macros/src/lib.rs b/cortex-m-rt/macros/src/lib.rs
@@ -189,7 +189,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream {
                 && f.sig.inputs.len() == 1
                 && match &f.sig.inputs[0] {
                     FnArg::Typed(arg) => match arg.ty.as_ref() {
-                        Type::Path(t) => true,
+                        Type::Path(_) => true,
                         _ => false,
                     },
                     _ => false,
diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs
@@ -785,11 +785,12 @@ pub use macros::entry;
 /// - Setting the default handler
 ///
 /// ```
+/// use cortex_m::peripheral::scb::Vector;
 /// use cortex_m_rt::exception;
 ///
 /// #[exception]
-/// unsafe fn DefaultHandler(irqn: i16) {
-///     println!("IRQn = {}", irqn);
+/// unsafe fn DefaultHandler(v: Vector) {
+///     println!("Unexpected interrupt: {:?}", v);
 /// }
 ///
 /// # fn main() {}
diff --git a/cortex-m-rt/tests/compile-fail/default-handler-bad-signature-1.rs b/cortex-m-rt/tests/compile-fail/default-handler-bad-signature-1.rs
@@ -1,9 +1,11 @@
 #![no_main]
 #![no_std]
 
+extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception};
 
 #[entry]
@@ -12,5 +14,5 @@ fn foo() -> ! {
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irqn: i16, undef: u32) {}
-//~^ ERROR `DefaultHandler` must have signature `unsafe fn(i16) [-> !]`
+unsafe fn DefaultHandler(_: Vector, _: u32) {}
+//~^ ERROR `DefaultHandler` must have signature `unsafe fn(Vector) [-> !]`
diff --git a/cortex-m-rt/tests/compile-fail/default-handler-bad-signature-2.rs b/cortex-m-rt/tests/compile-fail/default-handler-bad-signature-2.rs
@@ -1,9 +1,11 @@
 #![no_main]
 #![no_std]
 
+extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception};
 
 #[entry]
@@ -12,7 +14,7 @@ fn foo() -> ! {
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irqn: i16) -> u32 {
-    //~^ ERROR `DefaultHandler` must have signature `unsafe fn(i16) [-> !]`
+unsafe fn DefaultHandler(_: Vector) -> u32 {
+    //~^ ERROR `DefaultHandler` must have signature `unsafe fn(Vector) [-> !]`
     0
 }
diff --git a/cortex-m-rt/tests/compile-fail/default-handler-hidden.rs b/cortex-m-rt/tests/compile-fail/default-handler-hidden.rs
@@ -4,19 +4,21 @@
 #![no_main]
 #![no_std]
 
+extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
-use cortex_m_rt::{entry, exception};
+use cortex_m_rt::entry;
 
 #[entry]
 fn foo() -> ! {
     loop {}
 }
 
 mod hidden {
+    use cortex_m::peripheral::scb::Vector;
     use cortex_m_rt::exception;
 
     #[exception]
-    unsafe fn DefaultHandler(_irqn: i16) {}
+    unsafe fn DefaultHandler(_: Vector) {}
 }
diff --git a/cortex-m-rt/tests/compile-fail/default-handler-twice.rs b/cortex-m-rt/tests/compile-fail/default-handler-twice.rs
@@ -1,9 +1,11 @@
 #![no_main]
 #![no_std]
 
+extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception};
 
 #[entry]
@@ -12,11 +14,12 @@ fn foo() -> ! {
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irqn: i16) {}
+unsafe fn DefaultHandler(_: Vector) {}
 
 pub mod reachable {
+    use cortex_m::peripheral::scb::Vector;
     use cortex_m_rt::exception;
 
     #[exception] //~ ERROR symbol `DefaultHandler` is already defined
-    unsafe fn DefaultHandler(_irqn: i16) {}
+    unsafe fn DefaultHandler(_: Vector) {}
 }
diff --git a/cortex-m-rt/tests/compile-fail/exception-nmi-unsafe.rs b/cortex-m-rt/tests/compile-fail/exception-nmi-unsafe.rs
@@ -1,9 +1,11 @@
 #![no_main]
 #![no_std]
 
+extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception};
 
 #[entry]
@@ -12,7 +14,7 @@ fn foo() -> ! {
 }
 
 #[exception]
-fn DefaultHandler(_irq: i16) {}
+fn DefaultHandler(_: Vector) {}
 //~^ ERROR defining a `DefaultHandler` is unsafe and requires an `unsafe fn`
 
 #[exception]
diff --git a/cortex-m-rt/tests/compile-fail/unsafe-init-static.rs b/cortex-m-rt/tests/compile-fail/unsafe-init-static.rs
@@ -4,9 +4,11 @@
 #![no_main]
 #![no_std]
 
+extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
+use cortex_m::peripheral::scb::Vector;
 use cortex_m_rt::{entry, exception, interrupt};
 
 #[allow(non_camel_case_types)]
@@ -29,7 +31,7 @@ fn SVCall() {
 }
 
 #[exception]
-unsafe fn DefaultHandler(_irq: i16) {
+unsafe fn DefaultHandler(_: Vector) {
     static mut X: u32 = init();  //~ ERROR requires unsafe
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`#![no_main]`
`3`	`3`	`#![no_std]`
`4`	`4`
`5`		`-extern crate cortex_m_rt;`
`6`	`5`	`extern crate panic_halt;`
`7`	`6`
	`7`	`+use cortex_m::peripheral::scb::Vector;`
`8`	`8`	`use cortex_m_rt::{entry, exception};`
`9`	`9`
`10`	`10`	`#[entry]`
`@@ -13,6 +13,6 @@ fn foo() -> ! {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`#[exception]`
`16`		`-unsafe fn DefaultHandler(_irqn: i16) -> ! {`
	`16`	`+unsafe fn DefaultHandler(_: Vector) -> ! {`
`17`	`17`	`loop {}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`#![no_main]`
`5`	`5`	`#![no_std]`
`6`	`6`
`7`		`-extern crate cortex_m_rt;`
`8`	`7`	`extern crate panic_halt;`
`9`	`8`
	`9`	`+use cortex_m::peripheral::scb::Vector;`
`10`	`10`	`use cortex_m_rt::{entry, exception, ExceptionFrame};`
`11`	`11`
`12`	`12`	`#[entry]`
`@@ -17,7 +17,7 @@ unsafe fn main() -> ! {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`#[exception]`
`20`		`-unsafe fn DefaultHandler(_irqn: i16) {`
	`20`	`+unsafe fn DefaultHandler(_: Vector) {`
`21`	`21`	`foo();`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`#![no_main]`
`2`	`2`	`#![no_std]`
`3`	`3`
	`4`	`+extern crate cortex_m;`
`4`	`5`	`extern crate cortex_m_rt;`
`5`	`6`	`extern crate panic_halt;`
`6`	`7`
	`8`	`+use cortex_m::peripheral::scb::Vector;`
`7`	`9`	`use cortex_m_rt::{entry, exception};`
`8`	`10`
`9`	`11`	`#[entry]`
`@@ -12,7 +14,7 @@ fn foo() -> ! {`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`#[exception]`
`15`		`-unsafe fn DefaultHandler(_irqn: i16) -> u32 {`
`16`		- //~^ ERROR `DefaultHandler` must have signature `unsafe fn(i16) [-> !]`
	`17`	`+unsafe fn DefaultHandler(_: Vector) -> u32 {`
	`18`	+ //~^ ERROR `DefaultHandler` must have signature `unsafe fn(Vector) [-> !]`
`17`	`19`	`0`
`18`	`20`	`}`