michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-11' into post-12

Browse Source
This commit is contained in:
Philipp Oppermann
2025-03-27 15:16:18 +01:00
parent 9bdde30bd5 aa4f62187e
commit 3fedddde32
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -2,7 +2,7 @@
name = "blog_os" name = "blog_os"
version = "0.1.0" version = "0.1.0"
authors = ["Philipp Oppermann <dev@phil-opp.com>"] authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018" edition = "2024"
[[test]] [[test]]
name = "should_panic" name = "should_panic"

2
src/lib.rs
View File

@@ -75,7 +75,7 @@ pub fn hlt_loop() -> ! {
} }
#[cfg(test)] #[cfg(test)]
use bootloader::{entry_point, BootInfo}; use bootloader::{BootInfo, entry_point};
#[cfg(test)] #[cfg(test)]
entry_point!(test_kernel_main); entry_point!(test_kernel_main);

4
src/main.rs
View File

@@ -7,8 +7,8 @@
extern crate alloc; extern crate alloc;
use blog_os::println; use blog_os::println;
use blog_os::task::{executor::Executor, keyboard, Task}; use blog_os::task::{Task, executor::Executor, keyboard};
use bootloader::{entry_point, BootInfo}; use bootloader::{BootInfo, entry_point};
use core::panic::PanicInfo; use core::panic::PanicInfo;
entry_point!(kernel_main); entry_point!(kernel_main);