Skip to content

Commit 99df077

Browse files
committed
Auto merge of #51 - japaric:ci, r=japaric
fix ci None
2 parents 948e1fd + cdb2118 commit 99df077

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ language: rust
33
matrix:
44
include:
55
- env: TARGET=x86_64-unknown-linux-gnu
6-
rust: nightly
6+
# work around problem about 'every suggestion should have at least one span'
7+
rust: nightly-2017-11-21
78

89
- env: TARGET=thumbv6m-none-eabi
910
rust: nightly

ci/script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ set -euxo pipefail
33
main() {
44
if [ $TARGET = x86_64-unknown-linux-gnu ]; then
55
cargo build
6-
cargo test --tests
6+
cargo test --test cfail
77
return
88
fi
99

1010
xargo build --target $TARGET
11-
xargo test --target $TARGET --examples
11+
xargo check --target $TARGET --examples
1212
}
1313

1414
main

tests/cfail/interrupt.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use rtfm::app;
99

1010
app! {
1111
//~^ error no associated item named `EXTI33` found for type
12-
//~| error no associated item named `EXTI33` found for type
1312
device: stm32f103xx,
1413

1514
tasks: {

tests/cfail/wrong-threshold.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ fn idle() -> ! {
3939
fn exti0(mut ot: &mut Threshold, r: EXTI0::Resources) {
4040
r.A.claim(&mut ot, |_a, mut _it| {
4141
//~^ error cannot borrow `ot` as mutable more than once at a time
42-
//~| error cannot borrow `ot` as mutable more than once at a time
4342
// ERROR must use inner token `it` instead of the outer one (`ot`)
4443
r.B.claim(&mut ot, |_b, _| {})
4544
});

0 commit comments

Comments
 (0)