From e90cf07dd6785a34cbece152adc57dfcb3fbdd80 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Wed, 22 Nov 2017 09:40:36 +0100
Subject: [PATCH 1/2] fix ci

---
 ci/script.sh                   | 4 ++--
 tests/cfail/interrupt.rs       | 1 -
 tests/cfail/wrong-threshold.rs | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ci/script.sh b/ci/script.sh
index 6b85502462..af425da52f 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -3,12 +3,12 @@ set -euxo pipefail
 main() {
     if [ $TARGET = x86_64-unknown-linux-gnu ]; then
         cargo build
-        cargo test --tests
+        cargo test --test cfail
         return
     fi
 
     xargo build --target $TARGET
-    xargo test --target $TARGET --examples
+    xargo check --target $TARGET --examples
 }
 
 main
diff --git a/tests/cfail/interrupt.rs b/tests/cfail/interrupt.rs
index f7879f493c..66d2098be5 100644
--- a/tests/cfail/interrupt.rs
+++ b/tests/cfail/interrupt.rs
@@ -9,7 +9,6 @@ use rtfm::app;
 
 app! {
     //~^ error no associated item named `EXTI33` found for type
-    //~| error no associated item named `EXTI33` found for type
     device: stm32f103xx,
 
     tasks: {
diff --git a/tests/cfail/wrong-threshold.rs b/tests/cfail/wrong-threshold.rs
index b46f82def9..b97407150d 100644
--- a/tests/cfail/wrong-threshold.rs
+++ b/tests/cfail/wrong-threshold.rs
@@ -39,7 +39,6 @@ fn idle() -> ! {
 fn exti0(mut ot: &mut Threshold, r: EXTI0::Resources) {
     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 must use inner token `it` instead of the outer one (`ot`)
         r.B.claim(&mut ot, |_b, _| {})
     });

From cdb2118cd36f8bfbdb7e296580cae05d6291bc5d Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Wed, 22 Nov 2017 09:56:17 +0100
Subject: [PATCH 2/2] use older nightly for the x86_64 linux target

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 094e996c93..d92045592a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ language: rust
 matrix:
   include:
     - 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
       rust: nightly