merge

ableos/src/lib.rs

@@ -14,12 +14,12 @@
 #![feature(
     abi_x86_interrupt,
     alloc_error_handler,
+    arbitrary_enum_discriminant,
     asm_sym, // Needed for RISC-V
+    custom_test_frameworks,
     naked_functions,
     prelude_import,
 )]
-#![feature(arbitrary_enum_discriminant)]
-#![feature(custom_test_frameworks)]
 #![reexport_test_harness_main = "test_main"]
 #![test_runner(crate::test_runner)]
 

kernel/src/lib.rs

@@ -1,8 +1,6 @@
 //! The ableOS kernel.
 
-#![feature(alloc_error_handler)]
-#![feature(arbitrary_enum_discriminant)]
-#![feature(prelude_import)]
+#![feature(alloc_error_handler, arbitrary_enum_discriminant, prelude_import)]
 #![no_std]
 #![deny(missing_docs)]