From e9735738f78eb2d3ed702c512f9b081e2dbe30d5 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sat, 26 Nov 2016 12:15:34 +0100 Subject: [PATCH 1/2] Fix panic_fmt arguments: file is a &'static str --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 96b5624f..b026eb18 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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 {} From f4c9c12047a3d6184709eedacc16ef1cc6ff5f40 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sat, 26 Nov 2016 12:17:12 +0100 Subject: [PATCH 2/2] Fix panic_fmt arguments in post --- blog/post/05-allocating-frames.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blog/post/05-allocating-frames.md b/blog/post/05-allocating-frames.md index df306c3e..f9eec739 100644 --- a/blog/post/05-allocating-frames.md +++ b/blog/post/05-allocating-frames.md @@ -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{}