Skip to content

Commit 5331379

Browse files
committed
Bless tests
1 parent b0a1daa commit 5331379

19 files changed

+89
-87
lines changed

tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: function pointer types may not have generic parameters
2-
--> $DIR/generics.rs:14:40
2+
--> $DIR/generics.rs:15:40
33
|
44
LL | f1: extern "cmse-nonsecure-call" fn<U: Copy>(U, u32, u32, u32) -> u64,
55
| ^^^^^^^^^
66

77
error[E0425]: cannot find type `U` in this scope
8-
--> $DIR/generics.rs:14:50
8+
--> $DIR/generics.rs:15:50
99
|
1010
LL | struct Test<T: Copy> {
1111
| - similarly named type parameter `T` defined here
@@ -23,51 +23,51 @@ LL | struct Test<T: Copy, U> {
2323
| +++
2424

2525
error[E0562]: `impl Trait` is not allowed in `fn` pointer parameters
26-
--> $DIR/generics.rs:17:41
26+
--> $DIR/generics.rs:18:41
2727
|
2828
LL | f2: extern "cmse-nonsecure-call" fn(impl Copy, u32, u32, u32) -> impl Copy,
2929
| ^^^^^^^^^
3030
|
3131
= note: `impl Trait` is only allowed in arguments and return types of functions and methods
3232

3333
error[E0562]: `impl Trait` is not allowed in `fn` pointer return types
34-
--> $DIR/generics.rs:17:70
34+
--> $DIR/generics.rs:18:70
3535
|
3636
LL | f2: extern "cmse-nonsecure-call" fn(impl Copy, u32, u32, u32) -> impl Copy,
3737
| ^^^^^^^^^
3838
|
3939
= note: `impl Trait` is only allowed in arguments and return types of functions and methods
4040

4141
error[E0562]: `impl Trait` is not allowed in `fn` pointer parameters
42-
--> $DIR/generics.rs:20:42
42+
--> $DIR/generics.rs:21:42
4343
|
4444
LL | f3: extern "cmse-nonsecure-call" fn((impl Copy, u32), u32, u32, u32) -> (impl Copy, u32),
4545
| ^^^^^^^^^
4646
|
4747
= note: `impl Trait` is only allowed in arguments and return types of functions and methods
4848

4949
error[E0562]: `impl Trait` is not allowed in `fn` pointer return types
50-
--> $DIR/generics.rs:20:78
50+
--> $DIR/generics.rs:21:78
5151
|
5252
LL | f3: extern "cmse-nonsecure-call" fn((impl Copy, u32), u32, u32, u32) -> (impl Copy, u32),
5353
| ^^^^^^^^^
5454
|
5555
= note: `impl Trait` is only allowed in arguments and return types of functions and methods
5656

5757
error[E0798]: generics are not allowed in `extern "cmse-nonsecure-call"` signatures
58-
--> $DIR/generics.rs:23:41
58+
--> $DIR/generics.rs:24:41
5959
|
6060
LL | f4: extern "cmse-nonsecure-call" fn(T, u32, u32, u32) -> u64,
6161
| ^
6262

6363
error[E0798]: generics are not allowed in `extern "cmse-nonsecure-call"` signatures
64-
--> $DIR/generics.rs:24:41
64+
--> $DIR/generics.rs:25:41
6565
|
6666
LL | f5: extern "cmse-nonsecure-call" fn(Wrapper<T>, u32, u32, u32) -> u64,
6767
| ^^^^^^^^^^
6868

6969
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
70-
--> $DIR/generics.rs:30:71
70+
--> $DIR/generics.rs:31:71
7171
|
7272
LL | type WithTraitObject = extern "cmse-nonsecure-call" fn(&dyn Trait) -> &dyn Trait;
7373
| ^^^^^^^^^^ this type doesn't fit in the available registers
@@ -76,7 +76,7 @@ LL | type WithTraitObject = extern "cmse-nonsecure-call" fn(&dyn Trait) -> &dyn
7676
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
7777

7878
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
79-
--> $DIR/generics.rs:34:60
79+
--> $DIR/generics.rs:35:60
8080
|
8181
LL | extern "cmse-nonsecure-call" fn(&'static dyn Trait) -> &'static dyn Trait;
8282
| ^^^^^^^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -85,7 +85,7 @@ LL | extern "cmse-nonsecure-call" fn(&'static dyn Trait) -> &'static dyn Tra
8585
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
8686

8787
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
88-
--> $DIR/generics.rs:41:60
88+
--> $DIR/generics.rs:42:60
8989
|
9090
LL | extern "cmse-nonsecure-call" fn(WrapperTransparent) -> WrapperTransparent;
9191
| ^^^^^^^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -94,7 +94,7 @@ LL | extern "cmse-nonsecure-call" fn(WrapperTransparent) -> WrapperTranspare
9494
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
9595

9696
error[E0045]: C-variadic functions with the "cmse-nonsecure-call" calling convention are not supported
97-
--> $DIR/generics.rs:44:20
97+
--> $DIR/generics.rs:45:20
9898
|
9999
LL | type WithVarArgs = extern "cmse-nonsecure-call" fn(u32, ...);
100100
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadic function must have a compatible calling convention

tests/ui/cmse-nonsecure/cmse-nonsecure-call/infer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ add-minicore
22
//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
33
//@ needs-llvm-components: arm
4+
//@ ignore-backends: gcc
45
#![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
56
#![no_core]
67

tests/ui/cmse-nonsecure/cmse-nonsecure-call/infer.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error[E0282]: type annotations needed
2-
--> $DIR/infer.rs:16:13
2+
--> $DIR/infer.rs:17:13
33
|
44
LL | let _ = mem::transmute::<fn() -> _, extern "cmse-nonsecure-call" fn() -> _>;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`
66

77
error[E0282]: type annotations needed
8-
--> $DIR/infer.rs:21:13
8+
--> $DIR/infer.rs:22:13
99
|
1010
LL | let _ = mem::transmute::<fn() -> (i32, _), extern "cmse-nonsecure-call" fn() -> (i32, _)>;
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`
1212

1313
error[E0282]: type annotations needed
14-
--> $DIR/infer.rs:26:13
14+
--> $DIR/infer.rs:27:13
1515
|
1616
LL | let _ = mem::transmute::<fn(_: _) -> (), extern "cmse-nonsecure-call" fn(_: _) -> ()>;
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`
1818

1919
error[E0282]: type annotations needed
20-
--> $DIR/infer.rs:32:9
20+
--> $DIR/infer.rs:33:9
2121
|
2222
LL | mem::transmute::<fn(_: (i32, _)) -> (), extern "cmse-nonsecure-call" fn(_: (i32, _)) -> ()>;
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`

tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
2-
--> $DIR/params-via-stack.rs:16:64
2+
--> $DIR/params-via-stack.rs:17:64
33
|
44
LL | f1: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32),
55
| ^^^ ^^^ does not fit in the available registers
@@ -9,31 +9,31 @@ LL | f1: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32)
99
= note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
1010

1111
error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
12-
--> $DIR/params-via-stack.rs:17:61
12+
--> $DIR/params-via-stack.rs:18:61
1313
|
1414
LL | f2: extern "cmse-nonsecure-call" fn(u32, u32, u32, u16, u16),
1515
| ^^^ does not fit in the available registers
1616
|
1717
= note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
1818

1919
error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
20-
--> $DIR/params-via-stack.rs:18:51
20+
--> $DIR/params-via-stack.rs:19:51
2121
|
2222
LL | f3: extern "cmse-nonsecure-call" fn(u32, u64, u32),
2323
| ^^^ does not fit in the available registers
2424
|
2525
= note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
2626

2727
error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
28-
--> $DIR/params-via-stack.rs:19:56
28+
--> $DIR/params-via-stack.rs:20:56
2929
|
3030
LL | f4: extern "cmse-nonsecure-call" fn(AlignRelevant, u32),
3131
| ^^^ does not fit in the available registers
3232
|
3333
= note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
3434

3535
error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
36-
--> $DIR/params-via-stack.rs:20:41
36+
--> $DIR/params-via-stack.rs:21:41
3737
|
3838
LL | f5: extern "cmse-nonsecure-call" fn([u32; 5]),
3939
| ^^^^^^^^ does not fit in the available registers

tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.stderr

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
2-
--> $DIR/return-via-stack.rs:36:48
2+
--> $DIR/return-via-stack.rs:37:48
33
|
44
LL | u128: extern "cmse-nonsecure-call" fn() -> u128,
55
| ^^^^ this type doesn't fit in the available registers
@@ -8,7 +8,7 @@ LL | u128: extern "cmse-nonsecure-call" fn() -> u128,
88
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
99

1010
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
11-
--> $DIR/return-via-stack.rs:37:48
11+
--> $DIR/return-via-stack.rs:38:48
1212
|
1313
LL | i128: extern "cmse-nonsecure-call" fn() -> i128,
1414
| ^^^^ this type doesn't fit in the available registers
@@ -17,7 +17,7 @@ LL | i128: extern "cmse-nonsecure-call" fn() -> i128,
1717
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
1818

1919
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
20-
--> $DIR/return-via-stack.rs:26:46
20+
--> $DIR/return-via-stack.rs:27:46
2121
|
2222
LL | f1: extern "cmse-nonsecure-call" fn() -> ReprCU64,
2323
| ^^^^^^^^ this type doesn't fit in the available registers
@@ -26,7 +26,7 @@ LL | f1: extern "cmse-nonsecure-call" fn() -> ReprCU64,
2626
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
2727

2828
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
29-
--> $DIR/return-via-stack.rs:27:46
29+
--> $DIR/return-via-stack.rs:28:46
3030
|
3131
LL | f2: extern "cmse-nonsecure-call" fn() -> ReprCBytes,
3232
| ^^^^^^^^^^ this type doesn't fit in the available registers
@@ -35,7 +35,7 @@ LL | f2: extern "cmse-nonsecure-call" fn() -> ReprCBytes,
3535
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
3636

3737
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
38-
--> $DIR/return-via-stack.rs:28:46
38+
--> $DIR/return-via-stack.rs:29:46
3939
|
4040
LL | f3: extern "cmse-nonsecure-call" fn() -> U64Compound,
4141
| ^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -44,7 +44,7 @@ LL | f3: extern "cmse-nonsecure-call" fn() -> U64Compound,
4444
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
4545

4646
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
47-
--> $DIR/return-via-stack.rs:29:46
47+
--> $DIR/return-via-stack.rs:30:46
4848
|
4949
LL | f4: extern "cmse-nonsecure-call" fn() -> ReprCAlign16,
5050
| ^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -53,7 +53,7 @@ LL | f4: extern "cmse-nonsecure-call" fn() -> ReprCAlign16,
5353
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
5454

5555
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
56-
--> $DIR/return-via-stack.rs:30:46
56+
--> $DIR/return-via-stack.rs:31:46
5757
|
5858
LL | f5: extern "cmse-nonsecure-call" fn() -> [u8; 5],
5959
| ^^^^^^^ this type doesn't fit in the available registers
@@ -62,7 +62,7 @@ LL | f5: extern "cmse-nonsecure-call" fn() -> [u8; 5],
6262
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
6363

6464
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
65-
--> $DIR/return-via-stack.rs:52:46
65+
--> $DIR/return-via-stack.rs:53:46
6666
|
6767
LL | f1: extern "cmse-nonsecure-call" fn() -> ReprRustUnionU64,
6868
| ^^^^^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -71,7 +71,7 @@ LL | f1: extern "cmse-nonsecure-call" fn() -> ReprRustUnionU64,
7171
= note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
7272

7373
error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
74-
--> $DIR/return-via-stack.rs:53:46
74+
--> $DIR/return-via-stack.rs:54:46
7575
|
7676
LL | f2: extern "cmse-nonsecure-call" fn() -> ReprCUnionU64,
7777
| ^^^^^^^^^^^^^ this type doesn't fit in the available registers

tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0261]: use of undeclared lifetime name `'a`
2-
--> $DIR/undeclared-lifetime.rs:15:43
2+
--> $DIR/undeclared-lifetime.rs:16:43
33
|
44
LL | id::<extern "cmse-nonsecure-call" fn(&'a ())>(PhantomData);
55
| ^^ undeclared lifetime

tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0781]: the `"cmse-nonsecure-call"` ABI is only allowed on function pointers
2-
--> $DIR/wrong-abi-location-1.rs:10:1
2+
--> $DIR/wrong-abi-location-1.rs:11:1
33
|
44
LL | pub extern "cmse-nonsecure-call" fn test() {}
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0781]: the `"cmse-nonsecure-call"` ABI is only allowed on function pointers
2-
--> $DIR/wrong-abi-location-2.rs:10:1
2+
--> $DIR/wrong-abi-location-2.rs:11:1
33
|
44
LL | / extern "cmse-nonsecure-call" {
55
LL | | fn test();

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `...` is not supported for `extern "cmse-nonsecure-entry"` functions
2-
--> $DIR/c-variadic.rs:14:60
2+
--> $DIR/c-variadic.rs:15:60
33
|
44
LL | unsafe extern "cmse-nonsecure-entry" fn c_variadic(_: u32, _: ...) {
55
| ----------------------------- ^^^^^^
@@ -9,13 +9,13 @@ LL | unsafe extern "cmse-nonsecure-entry" fn c_variadic(_: u32, _: ...) {
99
= help: only `extern "C"` and `extern "C-unwind"` functions may have a C variable argument list
1010

1111
error: functions cannot be both `async` and C-variadic
12-
--> $DIR/c-variadic.rs:19:1
12+
--> $DIR/c-variadic.rs:20:1
1313
|
1414
LL | async unsafe extern "cmse-nonsecure-entry" fn async_and_c_variadic(_: ...) {
1515
| ^^^^^ `async` because of this ^^^^^^ C-variadic because of this
1616

1717
error: `...` is not supported for `extern "cmse-nonsecure-entry"` functions
18-
--> $DIR/c-variadic.rs:19:68
18+
--> $DIR/c-variadic.rs:20:68
1919
|
2020
LL | async unsafe extern "cmse-nonsecure-entry" fn async_and_c_variadic(_: ...) {
2121
| ----------------------------- ^^^^^^
@@ -25,7 +25,7 @@ LL | async unsafe extern "cmse-nonsecure-entry" fn async_and_c_variadic(_: ...)
2525
= help: only `extern "C"` and `extern "C-unwind"` functions may have a C variable argument list
2626

2727
error[E0798]: `impl Trait` is not allowed in `extern "cmse-nonsecure-entry"` signatures
28-
--> $DIR/c-variadic.rs:25:1
28+
--> $DIR/c-variadic.rs:26:1
2929
|
3030
LL | async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)