From 1b735d8fdd83206c85754a0fbd7755e4753274cf Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 3 May 2018 05:47:32 +0200 Subject: [PATCH] don't split the slot queue in --- Cargo.toml | 2 +- macros/src/trans.rs | 2 +- src/node.rs | 24 ------------------------ 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e703dbdbf7..01877674c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ required-features = ["timer-queue"] [dependencies] cortex-m = "0.4.0" cortex-m-rtfm-macros = { path = "macros", version = "0.3.1" } -heapless = "0.3.4" +heapless = "0.3.5" typenum = "1.10.0" [target.'cfg(target_arch = "x86_64")'.dev-dependencies] diff --git a/macros/src/trans.rs b/macros/src/trans.rs index 66a39498cf..ab74ee0878 100644 --- a/macros/src/trans.rs +++ b/macros/src/trans.rs @@ -699,7 +699,7 @@ pub fn app(ctxt: &Context, app: &App) -> Tokens { unsafe { #hidden::#krate::uninitialized() }; for node in N.iter_mut() { - #name::SQ::get().split().0.enqueue_unchecked(node.into()); + #name::SQ::get().enqueue_unchecked(node.into()); } } }) diff --git a/src/node.rs b/src/node.rs index 42f336e76d..9010b37bf0 100644 --- a/src/node.rs +++ b/src/node.rs @@ -14,30 +14,6 @@ where payload: T, } -#[cfg(feature = "timer-queue")] -impl Eq for Node {} - -#[cfg(feature = "timer-queue")] -impl Ord for Node { - fn cmp(&self, rhs: &Self) -> Ordering { - self.baseline.cmp(&rhs.baseline) - } -} - -#[cfg(feature = "timer-queue")] -impl PartialEq for Node { - fn eq(&self, rhs: &Self) -> bool { - self.baseline.eq(&rhs.baseline) - } -} - -#[cfg(feature = "timer-queue")] -impl PartialOrd for Node { - fn partial_cmp(&self, rhs: &Self) -> Option { - Some(self.cmp(rhs)) - } -} - #[doc(hidden)] pub struct Slot where