Skip to content

Commit

Permalink
Bump toolchain to nightly-2023-03-10
Browse files Browse the repository at this point in the history
We can almost use `stable`, except for requiring
`-Z no-unique-section-names=yes` to ensure that all symbols are located
in a single `.text` section (the Flipper Zero loader does not support
unique section names).

See rust-lang/rust#90275
  • Loading branch information
dcoles committed Mar 13, 2023
1 parent fea0bd2 commit 4839224
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
9 changes: 0 additions & 9 deletions crates/alloc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}
}
2 changes: 1 addition & 1 deletion crates/flipperzero/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2022-11-03"
channel = "nightly-2023-03-10"
targets = [ "thumbv7em-none-eabihf" ]

0 comments on commit 4839224

Please sign in to comment.