Merge branch 'post-11' into post-12

phil-opp · Apr 29, 2023 · c9cdf56 · c9cdf56
2 parents 2a393c5 + f5b5251
commit c9cdf56
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,7 +2,6 @@
 #![cfg_attr(test, no_main)]
 #![feature(custom_test_frameworks)]
 #![feature(abi_x86_interrupt)]
-#![feature(alloc_error_handler)]
 #![feature(const_mut_refs)]
 #![test_runner(crate::test_runner)]
 #![reexport_test_harness_main = "test_main"]
@@ -95,8 +94,3 @@ fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
 fn panic(info: &PanicInfo) -> ! {
     test_panic_handler(info)
 }
-
-#[alloc_error_handler]
-fn alloc_error_handler(layout: alloc::alloc::Layout) -> ! {
-    panic!("allocation error: {:?}", layout)
-}