Skip to content

Commit

Permalink
Fix CI with async_fn_in_trait not being a feature
Browse files Browse the repository at this point in the history
  • Loading branch information
korken89 committed Nov 1, 2023
1 parent 52aa56e commit 54f1820
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion rtic-macros/src/syntax/analyze.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ pub(crate) fn app(app: &App) -> Result<Analysis, syn::Error> {

// Collect errors if any and return/halt
if !error.is_empty() {
let mut err = error.get(0).unwrap().clone();
let mut err = error.first().unwrap().clone();
error.iter().for_each(|e| err.combine(e.clone()));
return Err(err);
}
Expand Down
1 change: 0 additions & 1 deletion rtic-monotonics/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#![no_std]
#![deny(missing_docs)]
#![allow(incomplete_features)]
#![feature(async_fn_in_trait)]
#![cfg_attr(docsrs, feature(doc_cfg))]

pub use rtic_time::{Monotonic, TimeoutError, TimerQueue};
Expand Down
1 change: 0 additions & 1 deletion rtic-time/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#![no_std]
#![deny(missing_docs)]
#![allow(incomplete_features)]
#![feature(async_fn_in_trait)]

use core::future::{poll_fn, Future};
use core::pin::Pin;
Expand Down
2 changes: 1 addition & 1 deletion rtic/src/export/cortex_basepri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use cortex_m::register::basepri;
pub use cortex_m::{
asm::wfi,
interrupt,
peripheral::{scb::SystemHandler, DWT, NVIC, SCB, SYST},
peripheral::{scb::SystemHandler, DWT, SCB, SYST},
Peripherals,
};

Expand Down
2 changes: 1 addition & 1 deletion xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub struct Target<'a> {
}

impl<'a> Target<'a> {
const DEFAULT_FEATURES: &str = "test-critical-section";
const DEFAULT_FEATURES: &'static str = "test-critical-section";

pub const fn new(triple: &'a str, has_std: bool) -> Self {
Self { triple, has_std }
Expand Down

0 comments on commit 54f1820

Please sign in to comment.