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 pull request #276 from phil-opp/p

Browse Source 
Make panic_fmt public to fix private_no_mangle_fns warning
This commit is contained in:
Philipp Oppermann
2017-01-04 16:21:19 +01:00
committed by GitHub
parent f6a1faab96 64cbabd1c2
commit ae1c9b3739
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blog/post/03-set-up-rust.md
View File

@@ -57,7 +57,7 @@ Now we place our root source file in `src/lib.rs`:
pub extern fn rust_main() {} pub extern fn rust_main() {}
#[lang = "eh_personality"] extern fn eh_personality() {} #[lang = "eh_personality"] extern fn eh_personality() {}
#[lang = "panic_fmt"] #[no_mangle] extern fn panic_fmt() -> ! {loop{}} #[lang = "panic_fmt"] #[no_mangle] pub extern fn panic_fmt() -> ! {loop{}}
``` ```
Let's break it down: Let's break it down:

4
blog/post/05-allocating-frames.md
View File

@@ -104,7 +104,7 @@ We used `expect` in the code above, which will panic if there is no memory map t
```rust ```rust
#[lang = "panic_fmt"] #[lang = "panic_fmt"]
#[no_mangle] #[no_mangle]
extern fn panic_fmt() -> ! { pub extern fn panic_fmt() -> ! {
println!("PANIC"); println!("PANIC");
loop{} loop{}
} }
@@ -114,7 +114,7 @@ Now we get a `PANIC` message. But we can do even better. The `panic_fmt` functio
```rust ```rust
#[lang = "panic_fmt"] #[lang = "panic_fmt"]
#[no_mangle] #[no_mangle]
extern fn panic_fmt(fmt: core::fmt::Arguments, file: &'static str, pub extern fn panic_fmt(fmt: core::fmt::Arguments, file: &'static str,
line: u32) -> ! line: u32) -> !
{ {
println!("\n\nPANIC in {} at line {}:", file, line); println!("\n\nPANIC in {} at line {}:", file, line);

2
src/lib.rs
View File

@@ -90,7 +90,7 @@ extern "C" fn eh_personality() {}
#[cfg(not(test))] #[cfg(not(test))]
#[lang = "panic_fmt"] #[lang = "panic_fmt"]
#[no_mangle] #[no_mangle]
extern "C" fn panic_fmt(fmt: core::fmt::Arguments, file: &'static str, line: u32) -> ! { pub extern "C" fn panic_fmt(fmt: core::fmt::Arguments, file: &'static str, line: u32) -> ! {
println!("\n\nPANIC in {} at line {}:", file, line); println!("\n\nPANIC in {} at line {}:", file, line);
println!(" {}", fmt); println!(" {}", fmt);
loop {} loop {}