diff --git a/Cargo.toml b/Cargo.toml index 406b8e25..92b74047 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 9572d85e..9120709b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -72,7 +72,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 c693f5d9..51f3028d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,14 +5,14 @@ #![reexport_test_harness_main = "test_main"] use blog_os::println; -use bootloader::{entry_point, BootInfo}; +use bootloader::{BootInfo, entry_point}; use core::panic::PanicInfo; entry_point!(kernel_main); fn kernel_main(boot_info: &'static BootInfo) -> ! { use blog_os::memory::{self, BootInfoFrameAllocator}; - use x86_64::{structures::paging::Page, VirtAddr}; + use x86_64::{VirtAddr, structures::paging::Page}; println!("Hello World{}", "!"); blog_os::init();