SeleDreams/libnds-sys
1
Fork 0
mirror of https://github.com/SeleDreams/libnds-sys.git synced 2025-06-18 19:15:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from not-jan/bugfix/panic

Browse Source 
Fix panic in newer Rust nightly
This commit is contained in:
SeleDreams 2025-01-10 19:27:58 +01:00 committed by GitHub
commit 14c92ea52e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/panic.rs
View File

@ -15,7 +15,10 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
// it's best to not require any allocations for printing the panic message
for c in s.bytes() {
unsafe {
crate::arm9_bindings::printf("%c\0".as_ptr() as *const core::ffi::c_char, c as core::ffi::c_int);
crate::arm9_bindings::printf(
"%c\0".as_ptr() as *const core::ffi::c_char,
c as core::ffi::c_int,
);
}
}
Ok(())
@ -31,13 +34,8 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
None => ("(unknown file)", 0),
};
if let Some(m) = info.message() {
let _ = write!(ConsoleWriter, "PANIC: {m}\n at {file}:{line}");
} else if let Some(m) = info.payload().downcast_ref::<&str>() {
let _ = write!(ConsoleWriter, "PANIC: {m}\n at {file}:{line}");
} else {
let _ = write!(ConsoleWriter, "PANIC: (no message)\n at {file}:{line}");
}
let message = info.message();
let _ = write!(ConsoleWriter, "PANIC: {message}\n at {file}:{line}");
}
loop {}