unbreak the build

This commit is contained in:
Jorge Aparicio 2018-05-04 05:39:06 +02:00
parent 1b735d8fdd
commit 6de27b9a64
7 changed files with 50 additions and 3 deletions

View file

@ -60,7 +60,6 @@ compiletest_rs = "0.3.5"
[dev-dependencies] [dev-dependencies]
panic-abort = "0.1.1" panic-abort = "0.1.1"
panic-itm = "0.1.0"
typenum = "1.10.0" typenum = "1.10.0"
[dev-dependencies.stm32f103xx] [dev-dependencies.stm32f103xx]

View file

@ -7,15 +7,31 @@ main() {
return return
fi fi
# examples that don't require the timer-queue feature
local examples=(
async
empty
interrupt
)
case $TARGET in case $TARGET in
thumbv7em-none-eabi*) thumbv7em-none-eabi*)
cargo check --target $TARGET --features cm7-r0p1 cargo check --target $TARGET --features cm7-r0p1
cargo check --target $TARGET --features cm7-r0p1 --examples for ex in ${examples[@]}; do
cargo check --target $TARGET --features cm7-r0p1 --example $ex
done
cargo check timer-queue --target $TARGET --features "cm7-r0p1 timer-queue"
cargo check --target $TARGET --features "cm7-r0p1 timer-queue" --examples
;; ;;
esac esac
cargo check --target $TARGET cargo check --target $TARGET
cargo check --target $TARGET --examples for ex in ${examples[@]}; do
cargo check --target $TARGET --features cm7-r0p1 --example $ex
done
cargo check --features timer-queue --target $TARGET
cargo check --features timer-queue --target $TARGET --examples
} }
main main

View file

@ -1,3 +1,5 @@
// 52 bytes .bss
//
// # -Os // # -Os
// init // init
// a(bl=8000000, now=8000180, input=0) // a(bl=8000000, now=8000180, input=0)

View file

@ -1,3 +1,5 @@
// 104 bytes .bss
//
// # -Os // # -Os
// a(bl=16000000, now=16000248, input=0) // a(bl=16000000, now=16000248, input=0)
// b(bl=24000000, now=24000251, input=0) // b(bl=24000000, now=24000251, input=0)

View file

@ -1,3 +1,5 @@
// 96 bytes .bss
//
// # -Os // # -Os
// init // init
// a(bl=16000000, now=16000249) // a(bl=16000000, now=16000249)

View file

@ -1,3 +1,5 @@
// 52 bytes .bss
//
// # -Os // # -Os
// init // init
// a(bl=8000000, now=8000180) // a(bl=8000000, now=8000180)

View file

@ -14,6 +14,30 @@ where
payload: T, payload: T,
} }
#[cfg(feature = "timer-queue")]
impl<T> Eq for Node<T> {}
#[cfg(feature = "timer-queue")]
impl<T> PartialEq for Node<T> {
fn eq(&self, other: &Node<T>) -> bool {
self.baseline == other.baseline
}
}
#[cfg(feature = "timer-queue")]
impl<T> Ord for Node<T> {
fn cmp(&self, other: &Node<T>) -> Ordering {
self.baseline.cmp(&other.baseline)
}
}
#[cfg(feature = "timer-queue")]
impl<T> PartialOrd for Node<T> {
fn partial_cmp(&self, other: &Node<T>) -> Option<Ordering> {
Some(self.cmp(other))
}
}
#[doc(hidden)] #[doc(hidden)]
pub struct Slot<T> pub struct Slot<T>
where where