mirror of
https://github.com/italicsjenga/agb.git
synced 2024-12-23 08:11:33 +11:00
Fix two build issues with latest rust version (#736)
- [x] no changelog update needed
This commit is contained in:
commit
476adafeb4
|
@ -180,7 +180,7 @@ impl Drop for InterruptInner {
|
||||||
fn inner_drop(this: Pin<&mut InterruptInner>) {
|
fn inner_drop(this: Pin<&mut InterruptInner>) {
|
||||||
// drop the closure allocation safely
|
// drop the closure allocation safely
|
||||||
let _closure_box =
|
let _closure_box =
|
||||||
unsafe { Box::from_raw(this.closure as *mut dyn Fn(&CriticalSection)) };
|
unsafe { Box::from_raw(this.closure as *mut dyn Fn(CriticalSection)) };
|
||||||
|
|
||||||
// perform the rest of the drop sequence
|
// perform the rest of the drop sequence
|
||||||
let root = unsafe { &*this.root };
|
let root = unsafe { &*this.root };
|
||||||
|
|
|
@ -205,7 +205,6 @@ pub use {agb_alloc::ExternalAllocator, agb_alloc::InternalAllocator};
|
||||||
fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
|
fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
|
||||||
avoid_double_panic(info);
|
avoid_double_panic(info);
|
||||||
|
|
||||||
use core::fmt::Write;
|
|
||||||
if let Some(mut mgba) = mgba::Mgba::new() {
|
if let Some(mut mgba) = mgba::Mgba::new() {
|
||||||
let _ = mgba.print(format_args!("{info}"), mgba::DebugLevel::Fatal);
|
let _ = mgba.print(format_args!("{info}"), mgba::DebugLevel::Fatal);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue