Skip to content

Commit 83c49b2

Browse files
committed
Bless tests
1 parent aef978a commit 83c49b2

File tree

6 files changed

+60
-29
lines changed

6 files changed

+60
-29
lines changed

tests/ui/feature-gates/feature-gate-abi.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ trait Tuple { }
1414
// Functions
1515
extern "rust-intrinsic" fn f1() {} //~ ERROR intrinsics are subject to change
1616
//~^ ERROR intrinsic must be in
17+
//~| ERROR unrecognized intrinsic function: `f1`
1718
extern "platform-intrinsic" fn f2() {} //~ ERROR platform intrinsics are experimental
1819
//~^ ERROR intrinsic must be in
20+
//~| ERROR unrecognized intrinsic function: `f2`
1921
extern "rust-call" fn f4(_: ()) {} //~ ERROR rust-call ABI is subject to change
2022

2123
// Methods in trait definition

tests/ui/feature-gates/feature-gate-abi.stderr

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | extern "rust-intrinsic" fn f1() {}
88
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
99

1010
error[E0658]: platform intrinsics are experimental and possibly buggy
11-
--> $DIR/feature-gate-abi.rs:17:8
11+
--> $DIR/feature-gate-abi.rs:18:8
1212
|
1313
LL | extern "platform-intrinsic" fn f2() {}
1414
| ^^^^^^^^^^^^^^^^^^^^
@@ -18,7 +18,7 @@ LL | extern "platform-intrinsic" fn f2() {}
1818
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1919

2020
error[E0658]: rust-call ABI is subject to change
21-
--> $DIR/feature-gate-abi.rs:19:8
21+
--> $DIR/feature-gate-abi.rs:21:8
2222
|
2323
LL | extern "rust-call" fn f4(_: ()) {}
2424
| ^^^^^^^^^^^
@@ -28,7 +28,7 @@ LL | extern "rust-call" fn f4(_: ()) {}
2828
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
2929

3030
error[E0658]: intrinsics are subject to change
31-
--> $DIR/feature-gate-abi.rs:23:12
31+
--> $DIR/feature-gate-abi.rs:25:12
3232
|
3333
LL | extern "rust-intrinsic" fn m1();
3434
| ^^^^^^^^^^^^^^^^
@@ -37,7 +37,7 @@ LL | extern "rust-intrinsic" fn m1();
3737
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
3838

3939
error[E0658]: platform intrinsics are experimental and possibly buggy
40-
--> $DIR/feature-gate-abi.rs:25:12
40+
--> $DIR/feature-gate-abi.rs:27:12
4141
|
4242
LL | extern "platform-intrinsic" fn m2();
4343
| ^^^^^^^^^^^^^^^^^^^^
@@ -47,7 +47,7 @@ LL | extern "platform-intrinsic" fn m2();
4747
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
4848

4949
error[E0658]: rust-call ABI is subject to change
50-
--> $DIR/feature-gate-abi.rs:27:12
50+
--> $DIR/feature-gate-abi.rs:29:12
5151
|
5252
LL | extern "rust-call" fn m4(_: ());
5353
| ^^^^^^^^^^^
@@ -57,7 +57,7 @@ LL | extern "rust-call" fn m4(_: ());
5757
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
5858

5959
error[E0658]: rust-call ABI is subject to change
60-
--> $DIR/feature-gate-abi.rs:29:12
60+
--> $DIR/feature-gate-abi.rs:31:12
6161
|
6262
LL | extern "rust-call" fn dm4(_: ()) {}
6363
| ^^^^^^^^^^^
@@ -67,7 +67,7 @@ LL | extern "rust-call" fn dm4(_: ()) {}
6767
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
6868

6969
error[E0658]: intrinsics are subject to change
70-
--> $DIR/feature-gate-abi.rs:36:12
70+
--> $DIR/feature-gate-abi.rs:38:12
7171
|
7272
LL | extern "rust-intrinsic" fn m1() {}
7373
| ^^^^^^^^^^^^^^^^
@@ -76,7 +76,7 @@ LL | extern "rust-intrinsic" fn m1() {}
7676
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
7777

7878
error[E0658]: platform intrinsics are experimental and possibly buggy
79-
--> $DIR/feature-gate-abi.rs:38:12
79+
--> $DIR/feature-gate-abi.rs:40:12
8080
|
8181
LL | extern "platform-intrinsic" fn m2() {}
8282
| ^^^^^^^^^^^^^^^^^^^^
@@ -86,7 +86,7 @@ LL | extern "platform-intrinsic" fn m2() {}
8686
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
8787

8888
error[E0658]: rust-call ABI is subject to change
89-
--> $DIR/feature-gate-abi.rs:40:12
89+
--> $DIR/feature-gate-abi.rs:42:12
9090
|
9191
LL | extern "rust-call" fn m4(_: ()) {}
9292
| ^^^^^^^^^^^
@@ -96,7 +96,7 @@ LL | extern "rust-call" fn m4(_: ()) {}
9696
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
9797

9898
error[E0658]: intrinsics are subject to change
99-
--> $DIR/feature-gate-abi.rs:45:12
99+
--> $DIR/feature-gate-abi.rs:47:12
100100
|
101101
LL | extern "rust-intrinsic" fn im1() {}
102102
| ^^^^^^^^^^^^^^^^
@@ -105,7 +105,7 @@ LL | extern "rust-intrinsic" fn im1() {}
105105
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
106106

107107
error[E0658]: platform intrinsics are experimental and possibly buggy
108-
--> $DIR/feature-gate-abi.rs:47:12
108+
--> $DIR/feature-gate-abi.rs:49:12
109109
|
110110
LL | extern "platform-intrinsic" fn im2() {}
111111
| ^^^^^^^^^^^^^^^^^^^^
@@ -115,7 +115,7 @@ LL | extern "platform-intrinsic" fn im2() {}
115115
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
116116

117117
error[E0658]: rust-call ABI is subject to change
118-
--> $DIR/feature-gate-abi.rs:49:12
118+
--> $DIR/feature-gate-abi.rs:51:12
119119
|
120120
LL | extern "rust-call" fn im4(_: ()) {}
121121
| ^^^^^^^^^^^
@@ -125,7 +125,7 @@ LL | extern "rust-call" fn im4(_: ()) {}
125125
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
126126

127127
error[E0658]: intrinsics are subject to change
128-
--> $DIR/feature-gate-abi.rs:53:18
128+
--> $DIR/feature-gate-abi.rs:55:18
129129
|
130130
LL | type A1 = extern "rust-intrinsic" fn();
131131
| ^^^^^^^^^^^^^^^^
@@ -134,7 +134,7 @@ LL | type A1 = extern "rust-intrinsic" fn();
134134
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
135135

136136
error[E0658]: platform intrinsics are experimental and possibly buggy
137-
--> $DIR/feature-gate-abi.rs:54:18
137+
--> $DIR/feature-gate-abi.rs:56:18
138138
|
139139
LL | type A2 = extern "platform-intrinsic" fn();
140140
| ^^^^^^^^^^^^^^^^^^^^
@@ -144,7 +144,7 @@ LL | type A2 = extern "platform-intrinsic" fn();
144144
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
145145

146146
error[E0658]: rust-call ABI is subject to change
147-
--> $DIR/feature-gate-abi.rs:55:18
147+
--> $DIR/feature-gate-abi.rs:57:18
148148
|
149149
LL | type A4 = extern "rust-call" fn(_: ());
150150
| ^^^^^^^^^^^
@@ -154,7 +154,7 @@ LL | type A4 = extern "rust-call" fn(_: ());
154154
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
155155

156156
error[E0658]: intrinsics are subject to change
157-
--> $DIR/feature-gate-abi.rs:58:8
157+
--> $DIR/feature-gate-abi.rs:60:8
158158
|
159159
LL | extern "rust-intrinsic" {}
160160
| ^^^^^^^^^^^^^^^^
@@ -163,7 +163,7 @@ LL | extern "rust-intrinsic" {}
163163
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
164164

165165
error[E0658]: platform intrinsics are experimental and possibly buggy
166-
--> $DIR/feature-gate-abi.rs:59:8
166+
--> $DIR/feature-gate-abi.rs:61:8
167167
|
168168
LL | extern "platform-intrinsic" {}
169169
| ^^^^^^^^^^^^^^^^^^^^
@@ -173,7 +173,7 @@ LL | extern "platform-intrinsic" {}
173173
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
174174

175175
error[E0658]: rust-call ABI is subject to change
176-
--> $DIR/feature-gate-abi.rs:60:8
176+
--> $DIR/feature-gate-abi.rs:62:8
177177
|
178178
LL | extern "rust-call" {}
179179
| ^^^^^^^^^^^
@@ -182,14 +182,26 @@ LL | extern "rust-call" {}
182182
= help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
183183
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
184184

185+
error[E0093]: unrecognized intrinsic function: `f1`
186+
--> $DIR/feature-gate-abi.rs:15:28
187+
|
188+
LL | extern "rust-intrinsic" fn f1() {}
189+
| ^^ unrecognized intrinsic
190+
191+
error[E0093]: unrecognized intrinsic function: `f2`
192+
--> $DIR/feature-gate-abi.rs:18:32
193+
|
194+
LL | extern "platform-intrinsic" fn f2() {}
195+
| ^^ unrecognized intrinsic
196+
185197
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
186-
--> $DIR/feature-gate-abi.rs:23:32
198+
--> $DIR/feature-gate-abi.rs:25:32
187199
|
188200
LL | extern "rust-intrinsic" fn m1();
189201
| ^^
190202

191203
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
192-
--> $DIR/feature-gate-abi.rs:25:36
204+
--> $DIR/feature-gate-abi.rs:27:36
193205
|
194206
LL | extern "platform-intrinsic" fn m2();
195207
| ^^
@@ -201,35 +213,36 @@ LL | extern "rust-intrinsic" fn f1() {}
201213
| ^^
202214

203215
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
204-
--> $DIR/feature-gate-abi.rs:17:37
216+
--> $DIR/feature-gate-abi.rs:18:37
205217
|
206218
LL | extern "platform-intrinsic" fn f2() {}
207219
| ^^
208220

209221
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
210-
--> $DIR/feature-gate-abi.rs:36:37
222+
--> $DIR/feature-gate-abi.rs:38:37
211223
|
212224
LL | extern "rust-intrinsic" fn m1() {}
213225
| ^^
214226

215227
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
216-
--> $DIR/feature-gate-abi.rs:38:41
228+
--> $DIR/feature-gate-abi.rs:40:41
217229
|
218230
LL | extern "platform-intrinsic" fn m2() {}
219231
| ^^
220232

221233
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
222-
--> $DIR/feature-gate-abi.rs:45:38
234+
--> $DIR/feature-gate-abi.rs:47:38
223235
|
224236
LL | extern "rust-intrinsic" fn im1() {}
225237
| ^^
226238

227239
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
228-
--> $DIR/feature-gate-abi.rs:47:42
240+
--> $DIR/feature-gate-abi.rs:49:42
229241
|
230242
LL | extern "platform-intrinsic" fn im2() {}
231243
| ^^
232244

233-
error: aborting due to 27 previous errors
245+
error: aborting due to 29 previous errors
234246

235-
For more information about this error, try `rustc --explain E0658`.
247+
Some errors have detailed explanations: E0093, E0658.
248+
For more information about an error, try `rustc --explain E0093`.

tests/ui/feature-gates/feature-gate-intrinsics.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ extern "rust-intrinsic" { //~ ERROR intrinsics are subject to change
44

55
extern "rust-intrinsic" fn baz() {} //~ ERROR intrinsics are subject to change
66
//~^ ERROR intrinsic must be in
7+
//~| ERROR unrecognized intrinsic function: `baz`
78

89
fn main() {}

tests/ui/feature-gates/feature-gate-intrinsics.stderr

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,19 @@ error[E0093]: unrecognized intrinsic function: `bar`
2222
LL | fn bar();
2323
| ^^^^^^^^^ unrecognized intrinsic
2424

25+
error[E0093]: unrecognized intrinsic function: `baz`
26+
--> $DIR/feature-gate-intrinsics.rs:5:28
27+
|
28+
LL | extern "rust-intrinsic" fn baz() {}
29+
| ^^^ unrecognized intrinsic
30+
2531
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
2632
--> $DIR/feature-gate-intrinsics.rs:5:34
2733
|
2834
LL | extern "rust-intrinsic" fn baz() {}
2935
| ^^
3036

31-
error: aborting due to 4 previous errors
37+
error: aborting due to 5 previous errors
3238

3339
Some errors have detailed explanations: E0093, E0658.
3440
For more information about an error, try `rustc --explain E0093`.

tests/ui/intrinsics-always-extern.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ impl Foo for () {
1010
}
1111

1212
extern "rust-intrinsic" fn hello() {//~ ERROR intrinsic must
13+
//~^ ERROR unrecognized intrinsic function: `hello`
1314
}
1415

1516
fn main() {

tests/ui/intrinsics-always-extern.stderr

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
44
LL | extern "rust-intrinsic" fn foo(&self);
55
| ^^^
66

7+
error[E0093]: unrecognized intrinsic function: `hello`
8+
--> $DIR/intrinsics-always-extern.rs:12:28
9+
|
10+
LL | extern "rust-intrinsic" fn hello() {
11+
| ^^^^^ unrecognized intrinsic
12+
713
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
814
--> $DIR/intrinsics-always-extern.rs:8:43
915
|
@@ -17,8 +23,10 @@ error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
1723
|
1824
LL | extern "rust-intrinsic" fn hello() {
1925
| ____________________________________^
26+
LL | |
2027
LL | | }
2128
| |_^
2229

23-
error: aborting due to 3 previous errors
30+
error: aborting due to 4 previous errors
2431

32+
For more information about this error, try `rustc --explain E0093`.

0 commit comments

Comments
 (0)