Merge #22

22: CI: also test on beta r=therealprof a=japaric

not all the examples can be tested on beta because intrinsics::abort is used in
some.

r? @rust-embedded/cortex-m (anyone)

Co-authored-by: Jorge Aparicio <jorge@japaric.io>

Author: bors[bot]

.travis.yml

@@ -1,11 +1,18 @@
 language: rust
-rust: nightly
 
 addons:
   apt:
     packages:
       - qemu-system-arm
 
+matrix:
+  include:
+    - rust: beta
+
+matrix:
+  include:
+    - rust: nightly
+
 install:
   - bash ci/install.sh
 

ci/script.sh

@@ -66,33 +66,39 @@ main() {
     edition_check
     popd
 
-    pushd app4
-    cargo build
-    qemu_check target/thumbv7m-none-eabi/debug/app
-    edition_check
-    popd
+    # NOTE(nightly) this will require nightly until core::arch::arm::udf is stabilized
+    if [ $TRAVIS_RUST_VERSION = nightly ]; then
+        pushd app4
+        cargo build
+        qemu_check target/thumbv7m-none-eabi/debug/app
+        edition_check
+        popd
+    fi
 
     popd
 
     # # exception handling
-    pushd exceptions
-
-    # check that the disassembly matches
-    pushd app
-    diff app.objdump \
-         <(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex)
-    diff app.vector_table.objdump \
-         <(cargo objdump --bin app --release -- -s -j .vector_table)
-    edition_check
-    popd
-
-    # check that it builds
-    pushd app2
-    cargo build
-    edition_check
-    popd
-
-    popd
+    # NOTE(nightly) this will require nightly until core::arch::arm::udf is stabilized
+    if [ $TRAVIS_RUST_VERSION = nightly ]; then
+        pushd exceptions
+
+        # check that the disassembly matches
+        pushd app
+        diff app.objdump \
+             <(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex)
+        diff app.vector_table.objdump \
+             <(cargo objdump --bin app --release -- -s -j .vector_table)
+        edition_check
+        popd
+
+        # check that it builds
+        pushd app2
+        cargo build
+        edition_check
+        popd
+
+        popd
+    fi
 }
 
 # checks that 2018 idioms are being used

src/preface.md

@@ -65,8 +65,9 @@ $ # Rust toolchain
 $ # If you start from scratch, get rustup from https://rustup.rs/
 $ rustup default beta
 
+$ # toolchain should be newer than this one
 $ rustc -V
-rustc 1.30.0-beta (????????? 2018-09-1?)
+rustc 1.30.0-beta.1 (14f51b05d 2018-09-18)
 
 $ rustup target add thumbv7m-none-eabi