Skip to content

Commit

Permalink
Merge pull request #98 from thalesfragoso/alloc-example
Browse files Browse the repository at this point in the history
Fix alloc example
  • Loading branch information
therealprof authored Oct 13, 2020
2 parents be44af6 + 5c6a17c commit 3cbcb99
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ panic-halt = "0.2.0"
# panic-itm = "0.4.1"

# Uncomment for the allocator example.
# alloc-cortex-m = "0.3.5"
# alloc-cortex-m = "0.4.0"

# Uncomment for the device example.
# Update `memory.x`, set target to `thumbv7em-none-eabihf` in `.cargo/config`,
Expand Down
3 changes: 1 addition & 2 deletions examples/allocator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
//!
//! ---

#![feature(alloc)]
#![feature(alloc_error_handler)]
#![no_main]
#![no_std]
Expand All @@ -23,7 +22,7 @@ use core::alloc::Layout;
use alloc_cortex_m::CortexMHeap;
use cortex_m::asm;
use cortex_m_rt::entry;
use cortex_m_semihosting::hprintln;
use cortex_m_semihosting::{hprintln, debug};

// this is the allocator the application will use
#[global_allocator]
Expand Down

0 comments on commit 3cbcb99

Please sign in to comment.