diff --git a/crates/alloc/src/lib.rs b/crates/alloc/src/lib.rs index 6b6462a3..ed3f1168 100644 --- a/crates/alloc/src/lib.rs +++ b/crates/alloc/src/lib.rs @@ -2,7 +2,6 @@ //! *Note:* This currently requires using nightly. #![no_std] -#![feature(alloc_error_handler)] use core::alloc::{GlobalAlloc, Layout}; use core::ffi::c_void; @@ -31,11 +30,3 @@ unsafe impl GlobalAlloc for FuriAlloc { #[global_allocator] static ALLOCATOR: FuriAlloc = FuriAlloc; - -#[alloc_error_handler] -fn on_oom(_layout: Layout) -> ! { - unsafe { - sys::furi_thread_yield(); - sys::crash!("Rust: Out of Memory"); - } -} diff --git a/crates/flipperzero/Cargo.toml b/crates/flipperzero/Cargo.toml index b7bf8dbd..2e7bac74 100644 --- a/crates/flipperzero/Cargo.toml +++ b/crates/flipperzero/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/dcoles/flipperzero-rs" readme = "../../README.md" license = "MIT" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.68.0" autobins = false autotests = false autobenches = false diff --git a/crates/rust-toolchain.toml b/crates/rust-toolchain.toml index 73254efb..a584c311 100644 --- a/crates/rust-toolchain.toml +++ b/crates/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2022-11-03" +channel = "nightly-2023-03-10" targets = [ "thumbv7em-none-eabihf" ]