Skip to content

Commit 3f25119

Browse files
bors[bot]japaric
andcommitted
Merge #155
155: ci: test on stable r=therealprof a=japaric now that 1.31 is out Co-authored-by: Jorge Aparicio <[email protected]>
2 parents 27be420 + 6b33a7b commit 3f25119

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

cortex-m-rt/.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ language: rust
33
matrix:
44
include:
55
- env: TARGET=x86_64-unknown-linux-gnu
6-
rust: beta
6+
rust: stable
77
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
88

99
- env: TARGET=thumbv6m-none-eabi
10-
rust: beta
10+
rust: stable
1111
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
1212

1313
- env: TARGET=thumbv7m-none-eabi
14-
rust: beta
14+
rust: stable
1515
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
1616

1717
- env: TARGET=thumbv7em-none-eabi
18-
rust: beta
18+
rust: stable
1919
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
2020

2121
- env: TARGET=thumbv7em-none-eabihf
22-
rust: beta
22+
rust: stable
2323
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
2424

2525
- env: TARGET=x86_64-unknown-linux-gnu

cortex-m-rt/tests/compile-fail/interrupt-not-reexported.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ fn foo() -> ! {
1111
loop {}
1212
}
1313

14-
#[interrupt] //~ ERROR failed to resolve. Use of undeclared type or module `interrupt`
14+
#[interrupt] //~ ERROR failed to resolve: use of undeclared type or module `interrupt`
1515
fn USART1() {}

0 commit comments

Comments
 (0)