move code to the 2018 edition

closes #1

ci/exceptions/app/Cargo.toml

@@ -1,7 +1,10 @@
+cargo-features = ["edition"]
+
 [package]
+authors = ["Jorge Aparicio <jorge@japaric.io>"]
+edition = "2018"
 name = "app"
 version = "0.1.0"
-authors = ["Jorge Aparicio <jorge@japaric.io>"]
 
 [dependencies]
 rt = { path = "../rt" }

ci/exceptions/app/src/main.rs

@@ -2,11 +2,10 @@
 #![no_main]
 #![no_std]
 
-#[macro_use]
-extern crate rt;
-
 use core::intrinsics;
 
+use rt::entry;
+
 entry!(main);
 
 fn main() -> ! {

ci/exceptions/app2/src/main.rs

@@ -2,11 +2,10 @@
 #![no_main]
 #![no_std]
 
-#[macro_use]
-extern crate rt;
-
 use core::intrinsics;
 
+use rt::entry;
+
 entry!(main);
 
 fn main() -> ! {

ci/exceptions/rt/src/lib.rs

@@ -37,7 +37,7 @@ pub unsafe extern "C" fn Reset() -> ! {
 pub static RESET_VECTOR: unsafe extern "C" fn() -> ! = Reset;
 
 #[panic_handler]
-fn panic(_panic: &PanicInfo) -> ! {
+fn panic(_panic: &PanicInfo<'_>) -> ! {
     loop {}
 }
 

ci/main/app/Cargo.toml

@@ -1,4 +1,7 @@
+cargo-features = ["edition"]
+
 [package]
+edition = '2018'
 name = "app"
 version = "0.1.0"
 authors = ["Jorge Aparicio <jorge@japaric.io>"]

ci/main/app2/src/main.rs

@@ -1,8 +1,7 @@
 #![no_std]
 #![no_main]
 
-#[macro_use]
-extern crate rt;
+use rt::entry;
 
 entry!(main);
 

ci/main/app3/src/main.rs

@@ -1,8 +1,7 @@
 #![no_std]
 #![no_main]
 
-#[macro_use]
-extern crate rt;
+use rt::entry;
 
 entry!(main);
 

ci/main/app4/Cargo.toml

@@ -1,7 +1,10 @@
+cargo-features = ["edition"]
+
 [package]
+authors = ["Jorge Aparicio <jorge@japaric.io>"]
+edition = "2018"
 name = "app"
 version = "0.1.0"
-authors = ["Jorge Aparicio <jorge@japaric.io>"]
 
 [dependencies]
 rt = { path = "../rt2" }

ci/main/app4/src/main.rs

@@ -2,11 +2,10 @@
 #![no_main]
 #![no_std]
 
-#[macro_use]
-extern crate rt;
-
 use core::ptr;
 
+use rt::entry;
+
 entry!(main);
 
 static mut DATA: i32 = 1;

ci/main/rt/Cargo.toml

@@ -1,6 +1,9 @@
+cargo-features = ["edition"]
+
 [package]
+authors = ["Jorge Aparicio <jorge@japaric.io>"]
+edition = "2018"
 name = "rt"
 version = "0.1.0"
-authors = ["Jorge Aparicio <jorge@japaric.io>"]
 
 [dependencies]

ci/main/rt/src/lib.rs

@@ -19,7 +19,7 @@ pub unsafe extern "C" fn Reset() -> ! {
 pub static RESET_VECTOR: unsafe extern "C" fn() -> ! = Reset;
 
 #[panic_handler]
-fn panic(_panic: &PanicInfo) -> ! {
+fn panic(_panic: &PanicInfo<'_>) -> ! {
     loop {}
 }
 

ci/main/rt2/src/lib.rs

@@ -37,7 +37,7 @@ pub unsafe extern "C" fn Reset() -> ! {
 pub static RESET_VECTOR: unsafe extern "C" fn() -> ! = Reset;
 
 #[panic_handler]
-fn panic(_panic: &PanicInfo) -> ! {
+fn panic(_panic: &PanicInfo<'_>) -> ! {
     loop {}
 }
 

ci/memory-layout/src/main.rs

@@ -19,6 +19,6 @@ pub unsafe extern "C" fn Reset() -> ! {
 pub static RESET_VECTOR: unsafe extern "C" fn() -> ! = Reset;
 
 #[panic_handler]
-fn panic(_panic: &PanicInfo) -> ! {
+fn panic(_panic: &PanicInfo<'_>) -> ! {
     loop {}
 }

ci/script.sh

@@ -23,6 +23,8 @@ main() {
     diff app.o.nm \
          <(cargo nm -- target/thumbv7m-none-eabi/debug/deps/app-*.o | grep '[0-9]* [^n] ')
 
+    edition_check
+
     popd
 
     # # memory-layout
@@ -38,6 +40,8 @@ main() {
 
     qemu_check target/thumbv7m-none-eabi/debug/app
 
+    edition_check
+
     popd
 
     # # main
@@ -47,20 +51,25 @@ main() {
     pushd app
     diff app.objdump \
          <(cargo objdump --bin app -- -d -no-show-raw-insn)
+    # disabled because of rust-lang/rust#53964
+    # edition_check
     popd
 
     # check that it builds
     pushd app2
     cargo build
+    edition_check
     popd
 
     pushd app3
     cargo build
+    edition_check
     popd
 
     pushd app4
     cargo build
     qemu_check target/thumbv7m-none-eabi/debug/app
+    edition_check
     popd
 
     popd
@@ -72,16 +81,23 @@ main() {
     pushd app
     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
 }
 
+# checks that 2018 idioms are being used
+edition_check() {
+    RUSTFLAGS="-D rust_2018_compatibility -D rust_2018_idioms" cargo check
+}
+
 # checks that QEMU doesn't crash and that it produces no error messages
 qemu_check() {
     qemu-system-arm \

ci/smallest-no-std/Cargo.toml

@@ -1,5 +1,8 @@
+cargo-features = ["edition"]
+
 [package]
 authors = ["Jorge Aparicio <jorge@japaric.io>"]
+edition = "2018"
 name = "app"
 version = "0.1.0"
 

ci/smallest-no-std/src/main.rs

@@ -5,6 +5,6 @@
 use core::panic::PanicInfo;
 
 #[panic_handler]
-fn panic(_panic: &PanicInfo) -> ! {
+fn panic(_panic: &PanicInfo<'_>) -> ! {
     loop {}
 }

src/preface.md

@@ -42,6 +42,23 @@ nor is access to a Cortex-M microcontroller needed -- all the examples included
 QEMU. You will, however, need to install the following tools to run and inspect the examples in this
 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]. Please also note that
+until the 2018 edition is officially released you'll have to *manually modify
+the Cargo.toml of new projects* to make use the 2018 edition. The required
+changes are shown below:
+
+[the edition guide]: https://rust-lang-nursery.github.io/edition-guide/
+
+``` diff
++cargo-features = ["edition"]
++
+ [package]
++edition = "2018"
+ name = "hello"
+ version = "0.1.0"
+```
+
 - A nightly toolchain from 2018-08-28 or newer.
 
 - [`cargo-binutils`](https://github.com/japaric/cargo-binutils). v0.1.2 or newer.