Merge #35

35: switch ci to stable and recommend using a stable toolchain r=therealprof a=japaric



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

Author: bors[bot]

.travis.yml

@@ -2,7 +2,7 @@ language: rust
 
 matrix:
   include:
-    - rust: beta
+    - rust: stable
     - rust: nightly
 
 install:

ci/exceptions/app/app.objdump

@@ -90,9 +90,9 @@ __aeabi_memset:
       fc:	adds	r3, r0, r1
       fe:	adds	r1, #0x4
      100:	cmp	lr, r1
-     102:	strb	r2, [r3, #0x1]
+     102:	strb	r2, [r3, #0x3]
      104:	strb	r2, [r3, #0x2]
-     106:	strb	r2, [r3, #0x3]
+     106:	strb	r2, [r3, #0x1]
      108:	bne	#-0x12 <__aeabi_memset+0x1c>
      10a:	cmp.w	r12, #0x0
      10e:	pop.w	{r7, lr}

ci/script.sh

@@ -16,7 +16,8 @@ main() {
     cargo rustc -- --emit=obj
 
     # check that the output is an empty binary
-    diff app.size \
+    # NOTE(-b) ignore change in whitespace
+    diff -b app.size \
          <(cargo size --bin app)
 
     # check presence of the `rust_begin_unwind` symbol

ci/smallest-no-std/app.size

@@ -1,2 +1,2 @@
-   text    data     bss     dec     hex filename
-      0       0       0       0       0 app
+   text	   data	    bss	    dec	    hex	filename
+      0	      0	      0	      0	      0	app

src/preface.md

@@ -44,8 +44,7 @@ book:
 - All the code in this book uses the 2018 edition. If you are not familiar with
   the 2018 features and idioms check [the edition guide].
 
-- Rust 1.30, 1.30-beta, nightly-2018-09-13, or a newer toolchain PLUS ARM
-  Cortex-M compilation support.
+- Rust 1.31 or a newer toolchain PLUS ARM Cortex-M compilation support.
 
 - [`cargo-binutils`](https://github.com/japaric/cargo-binutils). v0.1.4 or newer.
 
@@ -63,11 +62,11 @@ Instructions common to all OSes
 ``` console
 $ # Rust toolchain
 $ # If you start from scratch, get rustup from https://rustup.rs/
-$ rustup default beta
+$ rustup default stable
 
 $ # toolchain should be newer than this one
 $ rustc -V
-rustc 1.30.0-beta.1 (14f51b05d 2018-09-18)
+rustc 1.31.0 (abe02cefd 2018-12-04)
 
 $ rustup target add thumbv7m-none-eabi