Merge #124

bors[bot] · japaric · bors[bot] · commit 03f9290a06bb · 2018-09-17T23:56:49.000Z
124: use panic-halt instead of panic-{abort,semihosting} r=therealprof a=japaric

the former requires a feature gate; the later pulls in the cortex-m crate

Eventually we want to test this crate on beta. To do that our dependencies must
not contain feature gates. That's not the case of `panic-abort`, which depends
on the `core_intrinsics` feature.

This PR fixes that. I could have used `panic-semihosting` everywhere but decided
for `panic-halt` which has zero dependencies as I figured that might slightly
decrease CI times.

Co-authored-by: Jorge Aparicio &lt;jorge@japaric.io&gt;
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml
@@ -16,8 +16,7 @@ cortex-m-rt-macros = { path = "macros", version = "0.1.1" }
 
 [dev-dependencies]
 cortex-m = "0.5.4"
-panic-abort = "0.3.0"
-panic-semihosting = "0.4.0"
+panic-halt = "0.2.0"
 
 [dev-dependencies.rand]
 default-features = false
diff --git a/cortex-m-rt/examples/alignment.rs b/cortex-m-rt/examples/alignment.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_abort;
+extern crate panic_halt;
 
 use core::ptr;
 
diff --git a/cortex-m-rt/examples/data_overflow.rs b/cortex-m-rt/examples/data_overflow.rs
@@ -6,7 +6,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_abort;
+extern crate panic_halt;
 
 use core::ptr;
 
diff --git a/cortex-m-rt/examples/device.rs b/cortex-m-rt/examples/device.rs
@@ -6,7 +6,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use rt::entry;
 
diff --git a/cortex-m-rt/examples/divergent-default-handler.rs b/cortex-m-rt/examples/divergent-default-handler.rs
@@ -4,7 +4,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/examples/divergent-exception.rs b/cortex-m-rt/examples/divergent-exception.rs
@@ -3,7 +3,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/examples/entry-static.rs b/cortex-m-rt/examples/entry-static.rs
@@ -6,7 +6,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use rt::entry;
 
diff --git a/cortex-m-rt/examples/main.rs b/cortex-m-rt/examples/main.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 #[no_mangle]
 pub unsafe extern "C" fn main() -> ! {
diff --git a/cortex-m-rt/examples/minimal.rs b/cortex-m-rt/examples/minimal.rs
@@ -6,7 +6,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use rt::entry;
 
diff --git a/cortex-m-rt/examples/override-exception.rs b/cortex-m-rt/examples/override-exception.rs
@@ -7,7 +7,7 @@
 
 extern crate cortex_m;
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m::asm;
 use rt::{entry, exception, ExceptionFrame};
diff --git a/cortex-m-rt/examples/pre_init.rs b/cortex-m-rt/examples/pre_init.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use rt::{entry, pre_init};
 
diff --git a/cortex-m-rt/examples/rand.rs b/cortex-m-rt/examples/rand.rs
@@ -7,7 +7,7 @@
 extern crate cortex_m_rt as rt;
 use rt::entry;
 
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 extern crate rand;
 use rand::Rng;
diff --git a/cortex-m-rt/examples/state.rs b/cortex-m-rt/examples/state.rs
@@ -6,7 +6,7 @@
 #![no_std]
 
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use rt::{entry, exception};
 
diff --git a/cortex-m-rt/examples/unsafe-default-handler.rs b/cortex-m-rt/examples/unsafe-default-handler.rs
@@ -3,7 +3,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/examples/unsafe-entry.rs b/cortex-m-rt/examples/unsafe-entry.rs
@@ -3,7 +3,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::entry;
 
diff --git a/cortex-m-rt/examples/unsafe-exception.rs b/cortex-m-rt/examples/unsafe-exception.rs
@@ -3,7 +3,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/examples/unsafe-hard-fault.rs b/cortex-m-rt/examples/unsafe-hard-fault.rs
@@ -3,7 +3,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 
diff --git a/cortex-m-rt/examples/unsafety.rs b/cortex-m-rt/examples/unsafety.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 
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
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
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
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/default-handler-hidden.rs b/cortex-m-rt/tests/compile-fail/default-handler-hidden.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/default-handler-twice.rs b/cortex-m-rt/tests/compile-fail/default-handler-twice.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/entry-args.rs b/cortex-m-rt/tests/compile-fail/entry-args.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::entry;
 
diff --git a/cortex-m-rt/tests/compile-fail/entry-bad-signature-1.rs b/cortex-m-rt/tests/compile-fail/entry-bad-signature-1.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::entry;
 
diff --git a/cortex-m-rt/tests/compile-fail/entry-bad-signature-2.rs b/cortex-m-rt/tests/compile-fail/entry-bad-signature-2.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::entry;
 
diff --git a/cortex-m-rt/tests/compile-fail/entry-bad-signature-3.rs b/cortex-m-rt/tests/compile-fail/entry-bad-signature-3.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::entry;
 
diff --git a/cortex-m-rt/tests/compile-fail/entry-hidden.rs b/cortex-m-rt/tests/compile-fail/entry-hidden.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 mod hidden {
     use cortex_m_rt::entry;
diff --git a/cortex-m-rt/tests/compile-fail/entry-soundness.rs b/cortex-m-rt/tests/compile-fail/entry-soundness.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/entry-twice.rs b/cortex-m-rt/tests/compile-fail/entry-twice.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::entry;
 
diff --git a/cortex-m-rt/tests/compile-fail/exception-args.rs b/cortex-m-rt/tests/compile-fail/exception-args.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/exception-bad-signature-1.rs b/cortex-m-rt/tests/compile-fail/exception-bad-signature-1.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/exception-bad-signature-2.rs b/cortex-m-rt/tests/compile-fail/exception-bad-signature-2.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/exception-hidden.rs b/cortex-m-rt/tests/compile-fail/exception-hidden.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/exception-soundness.rs b/cortex-m-rt/tests/compile-fail/exception-soundness.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/exception-twice.rs b/cortex-m-rt/tests/compile-fail/exception-twice.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception};
 
diff --git a/cortex-m-rt/tests/compile-fail/hard-fault-bad-signature-1.rs b/cortex-m-rt/tests/compile-fail/hard-fault-bad-signature-1.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 
diff --git a/cortex-m-rt/tests/compile-fail/hard-fault-hidden.rs b/cortex-m-rt/tests/compile-fail/hard-fault-hidden.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 
diff --git a/cortex-m-rt/tests/compile-fail/hard-fault-twice.rs b/cortex-m-rt/tests/compile-fail/hard-fault-twice.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 
diff --git a/cortex-m-rt/tests/compile-fail/pre-init-args.rs b/cortex-m-rt/tests/compile-fail/pre-init-args.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, pre_init};
 
diff --git a/cortex-m-rt/tests/compile-fail/pre-init-bad-signature-1.rs b/cortex-m-rt/tests/compile-fail/pre-init-bad-signature-1.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, pre_init};
 
diff --git a/cortex-m-rt/tests/compile-fail/pre-init-bad-signature-2.rs b/cortex-m-rt/tests/compile-fail/pre-init-bad-signature-2.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, pre_init};
 
diff --git a/cortex-m-rt/tests/compile-fail/pre-init-hidden.rs b/cortex-m-rt/tests/compile-fail/pre-init-hidden.rs
@@ -5,7 +5,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 mod hidden {
     use cortex_m_rt::pre_init;
diff --git a/cortex-m-rt/tests/compile-fail/pre-init-twice.rs b/cortex-m-rt/tests/compile-fail/pre-init-twice.rs
@@ -2,7 +2,7 @@
 #![no_std]
 
 extern crate cortex_m_rt;
-extern crate panic_semihosting;
+extern crate panic_halt;
 
 use cortex_m_rt::{entry, pre_init};
 
