Skip to content

Commit

Permalink
Bump cortex-m-rt and re-enable lints (#703)
Browse files Browse the repository at this point in the history
  • Loading branch information
ia0 authored Dec 9, 2024
1 parent 781685f commit 9737b83
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
10 changes: 5 additions & 5 deletions crates/runner-nordic/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/runner-nordic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"

[dependencies]
cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
cortex-m-rt = { version = "0.7.3", features = ["set-vtor"] }
cortex-m-rt = { version = "0.7.5", features = ["set-vtor"] }
critical-section = "1.1.2"
defmt = { version = "0.3.8", features = ["avoid-default-panic"], optional = true }
defmt-rtt = { version = "0.4.1", optional = true }
Expand Down
3 changes: 2 additions & 1 deletion crates/runner-nordic/memory.x
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@ SECTIONS {
} > HEADER
}

_stack_start = ORIGIN(RAM);
_stack_end = __stack_origin;
_stack_start = __heap_origin;
__eheap = ORIGIN(RAM) + LENGTH(RAM);
3 changes: 0 additions & 3 deletions crates/runner-nordic/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ fn with_state<R>(f: impl FnOnce(&mut State) -> R) -> R {
critical_section::with(|cs| f(STATE.borrow_ref_mut(cs).as_mut().unwrap()))
}

// TODO(https://github.com/rust-embedded/cortex-m/issues/537): Remove when fixed.
#[allow(unsafe_op_in_unsafe_fn)]
#[allow(static_mut_refs)]
#[entry]
fn main() -> ! {
static mut CLOCKS: MaybeUninit<Clocks> = MaybeUninit::uninit();
Expand Down

0 comments on commit 9737b83

Please sign in to comment.