Merge #216

216: Fix compiletest tests r=therealprof a=jonas-schievink

Closes rust-embedded/cortex-m-rt#215

Co-authored-by: Jonas Schievink <[email protected]>

Author: bors[bot]

cortex-m-rt/Cargo.toml

@@ -30,7 +30,7 @@ features = ["small_rng"]
 version = "0.7"
 
 [target.'cfg(not(target_os = "none"))'.dev-dependencies]
-compiletest_rs = "0.3.25"
+compiletest_rs = "0.4.0"
 
 [[example]]
 name = "device"

cortex-m-rt/ci/script.sh

@@ -5,7 +5,7 @@ main() {
 
     cargo check --target $TARGET --features device
 
-    if [ $TARGET = x86_64-unknown-linux-gnu ] && [ $TRAVIS_RUST_VERSION = nightly ]; then
+    if [ $TARGET = x86_64-unknown-linux-gnu ] && [ $TRAVIS_RUST_VERSION = stable ]; then
         ( cd macros && cargo check && cargo test )
 
         cargo test --features device --test compiletest
@@ -73,7 +73,7 @@ main() {
             # linking with GNU LD
             env RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" cargo run --target $TARGET --example qemu | grep "x = 42"
             env RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" cargo run --target $TARGET --example qemu --release | grep "x = 42"
-            
+
             # linking with rustc's LLD
             cargo run --target $TARGET --example qemu | grep "x = 42"
             cargo run --target $TARGET --example qemu --release | grep "x = 42"

cortex-m-rt/tests/compile-fail/interrupt-invalid.rs

@@ -19,4 +19,4 @@ enum interrupt {
 // NOTE this looks a bit better when using a device crate:
 // "no variant named `foo` found for type `stm32f30x::Interrupt` in the current scope"
 #[interrupt]
-fn foo() {} //~ ERROR no variant named `foo` found for type `interrupt` in the current scope
+fn foo() {} //~ ERROR no variant or associated item named `foo` found for type `interrupt` in the current scope