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 pull request #256 from phil-opp/p1

Browse Source 
Fix panic_fmt arguments: file is a &'static str
This commit is contained in:
Philipp Oppermann
2016-11-26 12:27:42 +01:00
committed by GitHub
parent c7268cff3b f4c9c12047
commit c76f7b8b98
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,9 @@ Now we get a `PANIC` message. But we can do even better. The `panic_fmt` functio
```rust
#[lang = "panic_fmt"]
extern fn panic_fmt(fmt: core::fmt::Arguments, file: &str, line: u32) -> ! {
extern fn panic_fmt(fmt: core::fmt::Arguments, file: &'static str,
line: u32) -> !
{
println!("\n\nPANIC in {} at line {}:", file, line);
println!(" {}", fmt);
loop{}

2
src/lib.rs
View File

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