Skip to content

Commit b97282e

Browse files
tests: bless s/C-cmse/cmse/
1 parent 64c658f commit b97282e

21 files changed

+313
-313
lines changed

tests/ui/abi/unsupported.aarch64.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,29 +132,29 @@ error[E0570]: "vectorcall" is not a supported ABI for the current target
132132
LL | extern "vectorcall" {}
133133
| ^^^^^^^^^^^^
134134

135-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
135+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
136136
--> $DIR/unsupported.rs:120:28
137137
|
138-
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
139-
| ^^^^^^^^^^^^^^^^^^^^^^^
138+
LL | fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
139+
| ^^^^^^^^^^^^^^^^^^^^^
140140

141-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
141+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
142142
--> $DIR/unsupported.rs:125:8
143143
|
144-
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
145-
| ^^^^^^^^^^^^^^^^^^^^^^^^
144+
LL | extern "cmse-nonsecure-entry" fn cmse_entry() {}
145+
| ^^^^^^^^^^^^^^^^^^^^^^
146146

147-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
147+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
148148
--> $DIR/unsupported.rs:127:29
149149
|
150-
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
151-
| ^^^^^^^^^^^^^^^^^^^^^^^^
150+
LL | fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
151+
| ^^^^^^^^^^^^^^^^^^^^^^
152152

153-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
153+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
154154
--> $DIR/unsupported.rs:131:8
155155
|
156-
LL | extern "C-cmse-nonsecure-entry" {}
157-
| ^^^^^^^^^^^^^^^^^^^^^^^^
156+
LL | extern "cmse-nonsecure-entry" {}
157+
| ^^^^^^^^^^^^^^^^^^^^^^
158158

159159
error[E0570]: "thiscall" is not a supported ABI for the current target
160160
--> $DIR/unsupported.rs:141:17

tests/ui/abi/unsupported.arm.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,29 +114,29 @@ error[E0570]: "vectorcall" is not a supported ABI for the current target
114114
LL | extern "vectorcall" {}
115115
| ^^^^^^^^^^^^
116116

117-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
117+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
118118
--> $DIR/unsupported.rs:120:28
119119
|
120-
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
121-
| ^^^^^^^^^^^^^^^^^^^^^^^
120+
LL | fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
121+
| ^^^^^^^^^^^^^^^^^^^^^
122122

123-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
123+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
124124
--> $DIR/unsupported.rs:125:8
125125
|
126-
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
127-
| ^^^^^^^^^^^^^^^^^^^^^^^^
126+
LL | extern "cmse-nonsecure-entry" fn cmse_entry() {}
127+
| ^^^^^^^^^^^^^^^^^^^^^^
128128

129-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
129+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
130130
--> $DIR/unsupported.rs:127:29
131131
|
132-
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
133-
| ^^^^^^^^^^^^^^^^^^^^^^^^
132+
LL | fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
133+
| ^^^^^^^^^^^^^^^^^^^^^^
134134

135-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
135+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
136136
--> $DIR/unsupported.rs:131:8
137137
|
138-
LL | extern "C-cmse-nonsecure-entry" {}
139-
| ^^^^^^^^^^^^^^^^^^^^^^^^
138+
LL | extern "cmse-nonsecure-entry" {}
139+
| ^^^^^^^^^^^^^^^^^^^^^^
140140

141141
error[E0570]: "thiscall" is not a supported ABI for the current target
142142
--> $DIR/unsupported.rs:141:17

tests/ui/abi/unsupported.i686.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,29 +58,29 @@ error[E0570]: "riscv-interrupt-m" is not a supported ABI for the current target
5858
LL | extern "riscv-interrupt-m" {}
5959
| ^^^^^^^^^^^^^^^^^^^
6060

61-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
61+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
6262
--> $DIR/unsupported.rs:120:28
6363
|
64-
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
65-
| ^^^^^^^^^^^^^^^^^^^^^^^
64+
LL | fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
65+
| ^^^^^^^^^^^^^^^^^^^^^
6666

67-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
67+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
6868
--> $DIR/unsupported.rs:125:8
6969
|
70-
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
71-
| ^^^^^^^^^^^^^^^^^^^^^^^^
70+
LL | extern "cmse-nonsecure-entry" fn cmse_entry() {}
71+
| ^^^^^^^^^^^^^^^^^^^^^^
7272

73-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
73+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
7474
--> $DIR/unsupported.rs:127:29
7575
|
76-
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
77-
| ^^^^^^^^^^^^^^^^^^^^^^^^
76+
LL | fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
77+
| ^^^^^^^^^^^^^^^^^^^^^^
7878

79-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
79+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
8080
--> $DIR/unsupported.rs:131:8
8181
|
82-
LL | extern "C-cmse-nonsecure-entry" {}
83-
| ^^^^^^^^^^^^^^^^^^^^^^^^
82+
LL | extern "cmse-nonsecure-entry" {}
83+
| ^^^^^^^^^^^^^^^^^^^^^^
8484

8585
error: aborting due to 14 previous errors
8686

tests/ui/abi/unsupported.riscv32.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,29 @@ error[E0570]: "vectorcall" is not a supported ABI for the current target
126126
LL | extern "vectorcall" {}
127127
| ^^^^^^^^^^^^
128128

129-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
129+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
130130
--> $DIR/unsupported.rs:120:28
131131
|
132-
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
133-
| ^^^^^^^^^^^^^^^^^^^^^^^
132+
LL | fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
133+
| ^^^^^^^^^^^^^^^^^^^^^
134134

135-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
135+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
136136
--> $DIR/unsupported.rs:125:8
137137
|
138-
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
139-
| ^^^^^^^^^^^^^^^^^^^^^^^^
138+
LL | extern "cmse-nonsecure-entry" fn cmse_entry() {}
139+
| ^^^^^^^^^^^^^^^^^^^^^^
140140

141-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
141+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
142142
--> $DIR/unsupported.rs:127:29
143143
|
144-
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
145-
| ^^^^^^^^^^^^^^^^^^^^^^^^
144+
LL | fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
145+
| ^^^^^^^^^^^^^^^^^^^^^^
146146

147-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
147+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
148148
--> $DIR/unsupported.rs:131:8
149149
|
150-
LL | extern "C-cmse-nonsecure-entry" {}
151-
| ^^^^^^^^^^^^^^^^^^^^^^^^
150+
LL | extern "cmse-nonsecure-entry" {}
151+
| ^^^^^^^^^^^^^^^^^^^^^^
152152

153153
error[E0570]: "thiscall" is not a supported ABI for the current target
154154
--> $DIR/unsupported.rs:141:17

tests/ui/abi/unsupported.riscv64.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,29 @@ error[E0570]: "vectorcall" is not a supported ABI for the current target
126126
LL | extern "vectorcall" {}
127127
| ^^^^^^^^^^^^
128128

129-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
129+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
130130
--> $DIR/unsupported.rs:120:28
131131
|
132-
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
133-
| ^^^^^^^^^^^^^^^^^^^^^^^
132+
LL | fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
133+
| ^^^^^^^^^^^^^^^^^^^^^
134134

135-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
135+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
136136
--> $DIR/unsupported.rs:125:8
137137
|
138-
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
139-
| ^^^^^^^^^^^^^^^^^^^^^^^^
138+
LL | extern "cmse-nonsecure-entry" fn cmse_entry() {}
139+
| ^^^^^^^^^^^^^^^^^^^^^^
140140

141-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
141+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
142142
--> $DIR/unsupported.rs:127:29
143143
|
144-
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
145-
| ^^^^^^^^^^^^^^^^^^^^^^^^
144+
LL | fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
145+
| ^^^^^^^^^^^^^^^^^^^^^^
146146

147-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
147+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
148148
--> $DIR/unsupported.rs:131:8
149149
|
150-
LL | extern "C-cmse-nonsecure-entry" {}
151-
| ^^^^^^^^^^^^^^^^^^^^^^^^
150+
LL | extern "cmse-nonsecure-entry" {}
151+
| ^^^^^^^^^^^^^^^^^^^^^^
152152

153153
error[E0570]: "thiscall" is not a supported ABI for the current target
154154
--> $DIR/unsupported.rs:141:17

tests/ui/abi/unsupported.x64.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,29 +108,29 @@ LL | extern "stdcall-unwind" {}
108108
|
109109
= help: if you need `extern "stdcall-unwind"` on win32 and `extern "C-unwind"` everywhere else, use `extern "system-unwind"`
110110

111-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
111+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
112112
--> $DIR/unsupported.rs:120:28
113113
|
114-
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
115-
| ^^^^^^^^^^^^^^^^^^^^^^^
114+
LL | fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
115+
| ^^^^^^^^^^^^^^^^^^^^^
116116

117-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
117+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
118118
--> $DIR/unsupported.rs:125:8
119119
|
120-
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
121-
| ^^^^^^^^^^^^^^^^^^^^^^^^
120+
LL | extern "cmse-nonsecure-entry" fn cmse_entry() {}
121+
| ^^^^^^^^^^^^^^^^^^^^^^
122122

123-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
123+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
124124
--> $DIR/unsupported.rs:127:29
125125
|
126-
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
127-
| ^^^^^^^^^^^^^^^^^^^^^^^^
126+
LL | fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
127+
| ^^^^^^^^^^^^^^^^^^^^^^
128128

129-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
129+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
130130
--> $DIR/unsupported.rs:131:8
131131
|
132-
LL | extern "C-cmse-nonsecure-entry" {}
133-
| ^^^^^^^^^^^^^^^^^^^^^^^^
132+
LL | extern "cmse-nonsecure-entry" {}
133+
| ^^^^^^^^^^^^^^^^^^^^^^
134134

135135
error[E0570]: "thiscall" is not a supported ABI for the current target
136136
--> $DIR/unsupported.rs:141:17

tests/ui/abi/unsupported.x64_win.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,29 @@ error[E0570]: "thiscall" is not a supported ABI for the current target
7676
LL | extern "thiscall" {}
7777
| ^^^^^^^^^^
7878

79-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
79+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
8080
--> $DIR/unsupported.rs:120:28
8181
|
82-
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
83-
| ^^^^^^^^^^^^^^^^^^^^^^^
82+
LL | fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
83+
| ^^^^^^^^^^^^^^^^^^^^^
8484

85-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
85+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
8686
--> $DIR/unsupported.rs:125:8
8787
|
88-
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
89-
| ^^^^^^^^^^^^^^^^^^^^^^^^
88+
LL | extern "cmse-nonsecure-entry" fn cmse_entry() {}
89+
| ^^^^^^^^^^^^^^^^^^^^^^
9090

91-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
91+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
9292
--> $DIR/unsupported.rs:127:29
9393
|
94-
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
95-
| ^^^^^^^^^^^^^^^^^^^^^^^^
94+
LL | fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
95+
| ^^^^^^^^^^^^^^^^^^^^^^
9696

97-
error[E0570]: "C-cmse-nonsecure-entry" is not a supported ABI for the current target
97+
error[E0570]: "cmse-nonsecure-entry" is not a supported ABI for the current target
9898
--> $DIR/unsupported.rs:131:8
9999
|
100-
LL | extern "C-cmse-nonsecure-entry" {}
101-
| ^^^^^^^^^^^^^^^^^^^^^^^^
100+
LL | extern "cmse-nonsecure-entry" {}
101+
| ^^^^^^^^^^^^^^^^^^^^^^
102102

103103
error[E0570]: "thiscall" is not a supported ABI for the current target
104104
--> $DIR/unsupported.rs:141:17

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
1+
error[E0570]: "cmse-nonsecure-call" is not a supported ABI for the current target
22
--> $DIR/gate_test.rs:4:46
33
|
4-
LL | core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
5-
| ^^^^^^^^^^^^^^^^^^^^^^^
4+
LL | core::mem::transmute::<usize, extern "cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
5+
| ^^^^^^^^^^^^^^^^^^^^^
66

7-
error[E0658]: the extern "C-cmse-nonsecure-call" ABI is experimental and subject to change
7+
error[E0658]: the extern "cmse-nonsecure-call" ABI is experimental and subject to change
88
--> $DIR/gate_test.rs:4:46
99
|
10-
LL | core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
11-
| ^^^^^^^^^^^^^^^^^^^^^^^
10+
LL | core::mem::transmute::<usize, extern "cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
11+
| ^^^^^^^^^^^^^^^^^^^^^
1212
|
1313
= note: see issue #81391 <https://github.com/rust-lang/rust/issues/81391> for more information
14-
= help: add `#![feature(abi_c_cmse_nonsecure_call)]` to the crate attributes to enable
14+
= help: add `#![feature(abi_cmse_nonsecure_call)]` to the crate attributes to enable
1515
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1616

1717
error: aborting due to 2 previous errors

0 commit comments

Comments
 (0)