Auto merge of #51 - japaric:ci, r=japaric

fix ci

None
This commit is contained in:
homunkulus 2017-11-22 08:56:45 +00:00
commit 99df0776c6
4 changed files with 4 additions and 5 deletions

View file

@ -3,7 +3,8 @@ language: rust
matrix: matrix:
include: include:
- env: TARGET=x86_64-unknown-linux-gnu - env: TARGET=x86_64-unknown-linux-gnu
rust: nightly # work around problem about 'every suggestion should have at least one span'
rust: nightly-2017-11-21
- env: TARGET=thumbv6m-none-eabi - env: TARGET=thumbv6m-none-eabi
rust: nightly rust: nightly

View file

@ -3,12 +3,12 @@ set -euxo pipefail
main() { main() {
if [ $TARGET = x86_64-unknown-linux-gnu ]; then if [ $TARGET = x86_64-unknown-linux-gnu ]; then
cargo build cargo build
cargo test --tests cargo test --test cfail
return return
fi fi
xargo build --target $TARGET xargo build --target $TARGET
xargo test --target $TARGET --examples xargo check --target $TARGET --examples
} }
main main

View file

@ -9,7 +9,6 @@ use rtfm::app;
app! { app! {
//~^ error no associated item named `EXTI33` found for type //~^ error no associated item named `EXTI33` found for type
//~| error no associated item named `EXTI33` found for type
device: stm32f103xx, device: stm32f103xx,
tasks: { tasks: {

View file

@ -39,7 +39,6 @@ fn idle() -> ! {
fn exti0(mut ot: &mut Threshold, r: EXTI0::Resources) { fn exti0(mut ot: &mut Threshold, r: EXTI0::Resources) {
r.A.claim(&mut ot, |_a, mut _it| { r.A.claim(&mut ot, |_a, mut _it| {
//~^ error cannot borrow `ot` as mutable more than once at a time //~^ error cannot borrow `ot` as mutable more than once at a time
//~| error cannot borrow `ot` as mutable more than once at a time
// ERROR must use inner token `it` instead of the outer one (`ot`) // ERROR must use inner token `it` instead of the outer one (`ot`)
r.B.claim(&mut ot, |_b, _| {}) r.B.claim(&mut ot, |_b, _| {})
}); });