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

Merge branch 'post-06' into post-07

Browse Source
This commit is contained in:
Philipp Oppermann
2025-03-27 15:13:48 +01:00
parent d83ab74e53 3d94346f43
commit 08831b4ba1
3 changed files with 3 additions and 3 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

@@ -72,7 +72,7 @@ pub fn hlt_loop() -> ! {
/// Entry point for `cargo xtest` /// Entry point for `cargo xtest`
#[cfg(test)] #[cfg(test)]
#[no_mangle] #[unsafe(no_mangle)]
pub extern "C" fn _start() -> ! { pub extern "C" fn _start() -> ! {
init(); init();
test_main(); test_main();

2
src/main.rs
View File

@@ -7,7 +7,7 @@
use blog_os::println; use blog_os::println;
use core::panic::PanicInfo; use core::panic::PanicInfo;
#[no_mangle] #[unsafe(no_mangle)]
pub extern "C" fn _start() -> ! { pub extern "C" fn _start() -> ! {
println!("Hello World{}", "!"); println!("Hello World{}", "!");