delete panic-handler

rust-lang/rust#51647 was fixed

Author: AaronKutch

Cargo.toml

@@ -34,9 +34,6 @@ core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core
 [build-dependencies]
 cc = { optional = true, version = "1.0" }
 
-[dev-dependencies]
-panic-handler = { path = 'crates/panic-handler' }
-
 [features]
 default = ["compiler-builtins"]
 

crates/panic-handler/Cargo.toml

@@ -12,8 +12,6 @@
 #![feature(allocator_api)]
 #![no_std]
 
-extern crate panic_handler;
-
 #[cfg(all(not(thumb), not(windows), not(target_arch = "wasm32")))]
 #[link(name = "c")]
 extern "C" {}

crates/panic-handler/src/lib.rs

@@ -13,18 +13,6 @@ extern crate compiler_builtins;
 // test runner
 extern crate utest_cortex_m_qemu;
 
-// overrides `panic!`
-#[macro_use]
-extern crate utest_macros;
-
-use core::mem;
-
-macro_rules! panic {
-    ($($tt:tt)*) => {
-        upanic!($($tt)*);
-    };
-}
-
 extern "C" {
     fn __aeabi_memclr4(dest: *mut u8, n: usize);
     fn __aeabi_memset4(dest: *mut u8, n: usize, c: u32);
@@ -47,7 +35,7 @@ impl Aligned {
 #[test]
 fn memclr4() {
     let mut aligned = Aligned::new();
-    assert_eq!(mem::align_of_val(&aligned), 4);
+    assert_eq!(core::mem::align_of_val(&aligned), 4);
     let xs = &mut aligned.array;
 
     for n in 0..9 {

examples/intrinsics.rs

@@ -13,16 +13,6 @@ extern crate compiler_builtins;
 // test runner
 extern crate utest_cortex_m_qemu;
 
-// overrides `panic!`
-#[macro_use]
-extern crate utest_macros;
-
-macro_rules! panic {
-    ($($tt:tt)*) => {
-        upanic!($($tt)*);
-    };
-}
-
 extern "C" {
     fn __aeabi_memcpy(dest: *mut u8, src: *const u8, n: usize);
     fn __aeabi_memcpy4(dest: *mut u8, src: *const u8, n: usize);

testcrate/tests/aeabi_memclr.rs

@@ -13,18 +13,8 @@ extern crate compiler_builtins;
 // test runner
 extern crate utest_cortex_m_qemu;
 
-// overrides `panic!`
-#[macro_use]
-extern crate utest_macros;
-
 use core::mem;
 
-macro_rules! panic {
-    ($($tt:tt)*) => {
-        upanic!($($tt)*);
-    };
-}
-
 extern "C" {
     fn __aeabi_memset4(dest: *mut u8, n: usize, c: u32);
 }