diff options
| author |  Emil Fresk <emil.fresk@gmail.com>
| 2023-11-01 20:41:28 +0100 |
|---|---|---|
| committer | Emil Fresk <emil.fresk@gmail.com>
| 2023-11-01 19:52:57 +0000 |
| commit | 3c9a8f290d0615dd88c4f9a6e7660bdc7ce6fc9f (patch) | |
| tree | f4fc4ff33f2477d76f13747f6041f870b9db84bb | |
| parent | 52aa56e265f62252ce0eefeebcf100fdfd7be8c6 (diff) | |
| download | rtic-3c9a8f290d0615dd88c4f9a6e7660bdc7ce6fc9f.tar.gz rtic-3c9a8f290d0615dd88c4f9a6e7660bdc7ce6fc9f.tar.zst rtic-3c9a8f290d0615dd88c4f9a6e7660bdc7ce6fc9f.zip | |
Fix CI with async_fn_in_trait not being a feature
| -rw-r--r-- | rtic-macros/src/syntax/analyze.rs | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/lib.rs | 1 | ||||
| -rw-r--r-- | rtic-time/src/lib.rs | 1 | ||||
| -rw-r--r-- | rtic/src/export/cortex_basepri.rs | 2 | ||||
| -rw-r--r-- | xtask/src/main.rs | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/rtic-macros/src/syntax/analyze.rs b/rtic-macros/src/syntax/analyze.rs index 57f9f2cd..3e5e80bd 100644 --- a/rtic-macros/src/syntax/analyze.rs +++ b/rtic-macros/src/syntax/analyze.rs @@ -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); } diff --git a/rtic-monotonics/src/lib.rs b/rtic-monotonics/src/lib.rs index b34f9d62..8757eb85 100644 --- a/rtic-monotonics/src/lib.rs +++ b/rtic-monotonics/src/lib.rs @@ -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}; diff --git a/rtic-time/src/lib.rs b/rtic-time/src/lib.rs index 05c50260..0c3e3495 100644 --- a/rtic-time/src/lib.rs +++ b/rtic-time/src/lib.rs @@ -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; diff --git a/rtic/src/export/cortex_basepri.rs b/rtic/src/export/cortex_basepri.rs index e40ece4f..14017543 100644 --- a/rtic/src/export/cortex_basepri.rs +++ b/rtic/src/export/cortex_basepri.rs @@ -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, }; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 30c3da05..90ba13fb 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -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 } |