From 84f163f53474dbc436817f0e75e237999fcaf31e Mon Sep 17 00:00:00 2001 From: Erin Date: Sun, 28 Aug 2022 22:04:55 +0200 Subject: [PATCH] merge --- ableos/src/lib.rs | 4 ++-- kernel/src/lib.rs | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ableos/src/lib.rs b/ableos/src/lib.rs index 201ece87..9eab505c 100644 --- a/ableos/src/lib.rs +++ b/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)] diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index e354bda0..45ff7da6 100644 --- a/kernel/src/lib.rs +++ b/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)]