diff options
author | 2018-12-06 22:50:56 +0000 | |
---|---|---|
committer | 2018-12-06 22:50:56 +0000 | |
commit | 3f2511959f016024ef6a45cce75733e96159c154 (patch) | |
tree | a0756b6a0157b4e5a2c7995feeeadb06368893a4 | |
parent | 27be42000ee0fb8a42313fef1d2c0f1ea7624510 (diff) | |
parent | 6b33a7b91cd09936e8559520e4238d043af15fee (diff) | |
download | cortex-m-3f2511959f016024ef6a45cce75733e96159c154.tar.gz cortex-m-3f2511959f016024ef6a45cce75733e96159c154.tar.zst cortex-m-3f2511959f016024ef6a45cce75733e96159c154.zip |
Merge #155
155: ci: test on stable r=therealprof a=japaric
now that 1.31 is out
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
-rw-r--r-- | cortex-m-rt/.travis.yml | 10 | ||||
-rw-r--r-- | cortex-m-rt/tests/compile-fail/interrupt-not-reexported.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cortex-m-rt/.travis.yml b/cortex-m-rt/.travis.yml index 4da6efc..b3f5187 100644 --- a/cortex-m-rt/.travis.yml +++ b/cortex-m-rt/.travis.yml @@ -3,23 +3,23 @@ language: rust matrix: include: - env: TARGET=x86_64-unknown-linux-gnu - rust: beta + rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv6m-none-eabi - rust: beta + rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7m-none-eabi - rust: beta + rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7em-none-eabi - rust: beta + rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7em-none-eabihf - rust: beta + rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=x86_64-unknown-linux-gnu diff --git a/cortex-m-rt/tests/compile-fail/interrupt-not-reexported.rs b/cortex-m-rt/tests/compile-fail/interrupt-not-reexported.rs index 9530cf4..1ac674b 100644 --- a/cortex-m-rt/tests/compile-fail/interrupt-not-reexported.rs +++ b/cortex-m-rt/tests/compile-fail/interrupt-not-reexported.rs @@ -11,5 +11,5 @@ fn foo() -> ! { loop {} } -#[interrupt] //~ ERROR failed to resolve. Use of undeclared type or module `interrupt` +#[interrupt] //~ ERROR failed to resolve: use of undeclared type or module `interrupt` fn USART1() {} |