Skip to content

Fix CI after update of ubuntu and rust #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/on-target.yml
Original file line number Diff line number Diff line change
@@ -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 \
5 changes: 4 additions & 1 deletion cortex-m-rt/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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.
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};
2 changes: 1 addition & 1 deletion cortex-m/src/itm.rs
Original file line number Diff line number Diff line change
@@ -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());