Skip to content

Commit

Permalink
Merge pull request #562 from jannic/ci-on-ubuntu
Browse files Browse the repository at this point in the history
Fix CI after update of ubuntu and rust
  • Loading branch information
adamgreig authored Oct 18, 2024
2 parents 57ce011 + 9d07e3f commit 7ab06dd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
RUSTFLAGS: -C link-arg=-Tlink.x -D warnings
run: cargo build -p testsuite --target thumbv7m-none-eabi
- name: Install QEMU
run: sudo apt-get update && sudo apt-get install qemu qemu-system-arm
run: sudo apt-get update && sudo apt-get install qemu-system-arm
- name: Run testsuite
run: |
qemu-system-arm \
Expand Down
5 changes: 4 additions & 1 deletion cortex-m-rt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,10 @@ pub fn heap_start() -> *mut u32 {
static mut __sheap: u32;
}

unsafe { core::ptr::addr_of_mut!(__sheap) }
#[allow(unused_unsafe)] // no longer unsafe since rust 1.82.0
unsafe {
core::ptr::addr_of_mut!(__sheap)
}
}

// Entry point is Reset.
Expand Down
4 changes: 4 additions & 0 deletions cortex-m-semihosting/src/export.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
//! IMPLEMENTATION DETAILS USED BY MACROS

// This must be replaced by a different solution before rust edition 2024
// https://doc.rust-lang.org/nightly/edition-guide/rust-2024/static-mut-references.html
#![allow(static_mut_refs)]

use core::fmt::{self, Write};

use crate::hio::{self, HostStream};
Expand Down
2 changes: 1 addition & 1 deletion cortex-m/src/itm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ unsafe fn write_aligned_impl(port: &mut Stim, buffer: &[u8]) {

struct Port<'p>(&'p mut Stim);

impl<'p> fmt::Write for Port<'p> {
impl fmt::Write for Port<'_> {
#[inline]
fn write_str(&mut self, s: &str) -> fmt::Result {
write_all(self.0, s.as_bytes());
Expand Down

0 comments on commit 7ab06dd

Please sign in to comment.