Skip to content

Commit

Permalink
Fix CI with 1.80
Browse files Browse the repository at this point in the history
  • Loading branch information
korken89 committed Aug 7, 2024
1 parent f925cbe commit c1ce167
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -434,10 +434,11 @@ jobs:
tool: cargo-binutils

# Use precompiled if possible
- name: Install cargo-binutils
uses: taiki-e/install-action@v2
with:
tool: espflash
- name: Install espflash
run: cargo install espflash --version 3.1.0 --force
# uses: taiki-e/install-action@v2
# with:
# tool: espflash

- name: Install esptool.py
run: pip install esptool
Expand Down
2 changes: 1 addition & 1 deletion examples/lm3s6965/Cargo.lock

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

1 change: 1 addition & 0 deletions examples/lm3s6965/examples/t-cfg-resources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#![deny(warnings)]
#![deny(unsafe_code)]
#![deny(missing_docs)]
#![allow(unexpected_cfgs)]

use panic_semihosting as _;

Expand Down
1 change: 1 addition & 0 deletions rtic-monotonics/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ fn main() {
#[cfg(feature = "stm32-metapac")]
stm32();

println!("cargo::rustc-check-cfg=cfg(stm32)");
println!("cargo:rerun-if-changed=build.rs");
}

Expand Down
4 changes: 1 addition & 3 deletions rtic-sync/src/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,13 @@ impl<T, const N: usize> Default for Channel<T, N> {
impl<T, const N: usize> Channel<T, N> {
const _CHECK: () = assert!(N < 256, "This queue support a maximum of 255 entries");

const INIT_SLOTS: UnsafeCell<MaybeUninit<T>> = UnsafeCell::new(MaybeUninit::uninit());

/// Create a new channel.
pub const fn new() -> Self {
Self {
freeq: UnsafeCell::new(Deque::new()),
readyq: UnsafeCell::new(Deque::new()),
receiver_waker: WakerRegistration::new(),
slots: [Self::INIT_SLOTS; N],
slots: [const { UnsafeCell::new(MaybeUninit::uninit()) }; N],
wait_queue: WaitQueue::new(),
receiver_dropped: UnsafeCell::new(false),
num_senders: UnsafeCell::new(0),
Expand Down
2 changes: 1 addition & 1 deletion rtic/src/export/cortex_source_mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ where
/// - we execute the closure in a global critical section (interrupt free)
/// - CS entry cost, single write to core register
/// - CS exit cost, single write to core register
/// else
/// - else
/// - The `mask` value is folded to a constant at compile time
/// - CS entry, single write of the 32 bit `mask` to the `icer` register
/// - CS exit, single write of the 32 bit `mask` to the `iser` register
Expand Down
1 change: 1 addition & 0 deletions rtic/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
html_favicon_url = "https://raw.githubusercontent.com/rtic-rs/rtic/master/book/en/src/RTIC.svg"
)]
#![allow(clippy::inline_always)]
#![allow(unexpected_cfgs)]

pub use rtic_core::{prelude as mutex_prelude, Exclusive, Mutex};
pub use rtic_macros::app;
Expand Down

0 comments on commit c1ce167

Please sign in to comment.