diff --git a/Cargo.toml b/Cargo.toml index ff0abbbe..b25ec76f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "blog_os" version = "0.1.0" authors = ["Philipp Oppermann "] -edition = "2018" +edition = "2024" [[test]] name = "should_panic" diff --git a/src/lib.rs b/src/lib.rs index 037f2910..166dcaae 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -75,7 +75,7 @@ pub fn hlt_loop() -> ! { } #[cfg(test)] -use bootloader::{entry_point, BootInfo}; +use bootloader::{BootInfo, entry_point}; #[cfg(test)] entry_point!(test_kernel_main); diff --git a/src/main.rs b/src/main.rs index 4f68111e..b170eb33 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,8 +7,8 @@ extern crate alloc; use blog_os::println; -use blog_os::task::{executor::Executor, keyboard, Task}; -use bootloader::{entry_point, BootInfo}; +use blog_os::task::{Task, executor::Executor, keyboard}; +use bootloader::{BootInfo, entry_point}; use core::panic::PanicInfo; entry_point!(kernel_main);