Merge remote-tracking branch 'upstream/master' into new-objects

This commit is contained in:
Corwin 2023-04-23 18:56:07 +01:00
commit b75481b88e
No known key found for this signature in database
2 changed files with 0 additions and 10 deletions

View file

@ -120,15 +120,6 @@ pub(crate) unsafe fn number_of_blocks() -> u32 {
GLOBAL_ALLOC.number_of_blocks()
}
#[alloc_error_handler]
fn alloc_error(layout: Layout) -> ! {
panic!(
"Failed to allocate size {} with alignment {}",
layout.size(),
layout.align()
);
}
fn iwram_data_end() -> usize {
extern "C" {
static __iwram_end: usize;

View file

@ -10,7 +10,6 @@
any(test, feature = "testing"),
reexport_test_harness_main = "test_main"
)]
#![feature(alloc_error_handler)]
#![feature(allocator_api)]
#![feature(asm_const)]
#![warn(clippy::all)]