Skip to content

Commit e753ce3

Browse files
committed
msp430-rt-macros: Fix trybuild tests to match new compiler output. global_cs test removed because CriticalSection is Copy.
1 parent f88eb2c commit e753ce3

File tree

4 files changed

+14
-66
lines changed

4 files changed

+14
-66
lines changed

macros/tests/ui/entry_preinterrupt_mismatch.stderr

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ error[E0308]: mismatched types
22
--> tests/ui/entry_preinterrupt_mismatch.rs:10:1
33
|
44
10 | #[entry(interrupt_enable(pre_interrupt = init))]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found `u32`
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
| |
7+
| expected `bool`, found `u32`
8+
| arguments to this function are incorrect
69
|
10+
note: function defined here
11+
--> tests/ui/entry_preinterrupt_mismatch.rs:10:1
12+
|
13+
10 | #[entry(interrupt_enable(pre_interrupt = init))]
14+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
715
= note: this error originates in the attribute macro `entry` (in Nightly builds, run with -Z macro-backtrace for more info)

macros/tests/ui/entry_preinterrupt_no_arg.stderr

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied
22
--> tests/ui/entry_preinterrupt_no_arg.rs:7:42
33
|
44
7 | #[entry(interrupt_enable(pre_interrupt = init))]
5-
| -----------------------------------------^^^^---
6-
| | |
7-
| | expected 0 arguments
8-
| supplied 1 argument
5+
| -----------------------------------------^^^^--- argument of type `CriticalSection<'_>` unexpected
96
|
107
note: function defined here
118
--> tests/ui/entry_preinterrupt_no_arg.rs:5:4
129
|
1310
5 | fn init() {}
1411
| ^^^^
12+
help: remove the extra argument
13+
|
14+
7 | init()
15+
|

macros/tests/ui/global_cs.rs

Lines changed: 0 additions & 22 deletions
This file was deleted.

macros/tests/ui/global_cs.stderr

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)