Skip to content

Commit 236fac7

Browse files
bors[bot]japaric
andcommitted
Merge #171
171: update cfail tests to make them pass with latest nightly r=therealprof a=japaric Co-authored-by: Jorge Aparicio <[email protected]>
2 parents 28f74ed + 1f08b69 commit 236fac7

6 files changed

+8
-2
lines changed

cortex-m-rt/tests/compile-fail/duplicate-static.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ extern crate panic_halt;
66

77
use cortex_m_rt::{entry, exception, interrupt};
88

9+
#[allow(non_camel_case_types)]
910
enum interrupt {
1011
UART0,
1112
}

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

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

14+
#[allow(non_camel_case_types)]
1415
enum interrupt {
1516
USART1,
1617
}

cortex-m-rt/tests/compile-fail/interrupt-bad-signature-1.rs

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

14+
#[allow(non_camel_case_types)]
1415
enum interrupt {
1516
USART1,
1617
}

cortex-m-rt/tests/compile-fail/interrupt-bad-signature-2.rs

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

14+
#[allow(non_camel_case_types)]
1415
enum interrupt {
1516
USART1,
1617
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ fn foo() -> ! {
1111
loop {}
1212
}
1313

14+
#[allow(non_camel_case_types)]
1415
enum interrupt {
1516
USART1,
1617
}
1718

1819
// NOTE this looks a bit better when using a device crate:
1920
// "no variant named `foo` found for type `stm32f30x::Interrupt` in the current scope"
20-
#[interrupt] //~ ERROR no variant named `foo` found for type `interrupt` in the current scope
21-
fn foo() {}
21+
#[interrupt]
22+
fn foo() {} //~ ERROR no variant named `foo` found for type `interrupt` in the current scope

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

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

14+
#[allow(non_camel_case_types)]
1415
enum interrupt {
1516
USART1,
1617
USART2,

0 commit comments

Comments
 (0)