mirror of
https://github.com/slint-ui/slint.git
synced 2025-11-03 05:12:55 +00:00
MCU: Remove the alloc_error_handler feature
`default_alloc_error_handler` is being stabilized in Rust 1.68, so current nightly don't need any unstable features anymore
This commit is contained in:
parent
995d960a2a
commit
9fdfa840b8
5 changed files with 0 additions and 28 deletions
|
|
@ -14,11 +14,6 @@ use esp_alloc::EspHeap;
|
||||||
use esp_println::println;
|
use esp_println::println;
|
||||||
pub use xtensa_lx_rt::entry;
|
pub use xtensa_lx_rt::entry;
|
||||||
|
|
||||||
#[alloc_error_handler]
|
|
||||||
fn oom(layout: core::alloc::Layout) -> ! {
|
|
||||||
panic!("Out of memory {:?}", layout);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
#[inline(never)]
|
||||||
#[panic_handler]
|
#[panic_handler]
|
||||||
fn panic(info: &core::panic::PanicInfo) -> ! {
|
fn panic(info: &core::panic::PanicInfo) -> ! {
|
||||||
|
|
|
||||||
|
|
@ -20,11 +20,6 @@ use esp_backtrace as _;
|
||||||
use mipidsi::{Display, DisplayOptions, Orientation};
|
use mipidsi::{Display, DisplayOptions, Orientation};
|
||||||
pub use xtensa_lx_rt::entry;
|
pub use xtensa_lx_rt::entry;
|
||||||
|
|
||||||
#[alloc_error_handler]
|
|
||||||
fn oom(layout: core::alloc::Layout) -> ! {
|
|
||||||
panic!("Out of memory {:?}", layout);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[global_allocator]
|
#[global_allocator]
|
||||||
static ALLOCATOR: EspHeap = EspHeap::empty();
|
static ALLOCATOR: EspHeap = EspHeap::empty();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,15 +6,6 @@
|
||||||
#![doc = include_str!("README.md")]
|
#![doc = include_str!("README.md")]
|
||||||
#![doc(html_logo_url = "https://slint-ui.com/logo/slint-logo-square-light.svg")]
|
#![doc(html_logo_url = "https://slint-ui.com/logo/slint-logo-square-light.svg")]
|
||||||
#![cfg_attr(not(feature = "std"), no_std)]
|
#![cfg_attr(not(feature = "std"), no_std)]
|
||||||
#![cfg_attr(
|
|
||||||
any(
|
|
||||||
feature = "pico-st7789",
|
|
||||||
feature = "stm32h735g",
|
|
||||||
feature = "esp32-s2-kaluga-1",
|
|
||||||
feature = "esp32-s3-box"
|
|
||||||
),
|
|
||||||
feature(alloc_error_handler)
|
|
||||||
)]
|
|
||||||
|
|
||||||
extern crate alloc;
|
extern crate alloc;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,11 +28,6 @@ use slint::platform::{PointerEventButton, WindowEvent};
|
||||||
#[cfg(feature = "panic-probe")]
|
#[cfg(feature = "panic-probe")]
|
||||||
use panic_probe as _;
|
use panic_probe as _;
|
||||||
|
|
||||||
#[alloc_error_handler]
|
|
||||||
fn oom(layout: core::alloc::Layout) -> ! {
|
|
||||||
panic!("Out of memory {:?}", layout);
|
|
||||||
}
|
|
||||||
|
|
||||||
mod display_interface_spi;
|
mod display_interface_spi;
|
||||||
|
|
||||||
const HEAP_SIZE: usize = 200 * 1024;
|
const HEAP_SIZE: usize = 200 * 1024;
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,6 @@ use stm32h7xx_hal as hal; // global logger
|
||||||
#[cfg(feature = "panic-probe")]
|
#[cfg(feature = "panic-probe")]
|
||||||
use panic_probe as _;
|
use panic_probe as _;
|
||||||
|
|
||||||
#[alloc_error_handler]
|
|
||||||
fn oom(layout: core::alloc::Layout) -> ! {
|
|
||||||
panic!("Out of memory {:?}", layout);
|
|
||||||
}
|
|
||||||
use alloc_cortex_m::CortexMHeap;
|
use alloc_cortex_m::CortexMHeap;
|
||||||
|
|
||||||
const HEAP_SIZE: usize = 200 * 1024;
|
const HEAP_SIZE: usize = 200 * 1024;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue