Skip to content

Commit 4e4fa2a

Browse files
workingjubileeworkingjubilee
committed
tests: error strings for ABI stability now match
1 parent ba5e201 commit 4e4fa2a

24 files changed

+140
-140
lines changed

Diff for: ‎tests/ui/feature-gates/feature-gate-abi-avr-interrupt.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,43 @@ trait Sized { }
99
// feature gate is not used.
1010

1111
extern "avr-non-blocking-interrupt" fn fu() {}
12-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
12+
//~^ ERROR avr-non-blocking-interrupt ABI is experimental
1313
extern "avr-interrupt" fn f() {}
14-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
14+
//~^ ERROR avr-interrupt ABI is experimental
1515

1616
trait T {
1717
extern "avr-interrupt" fn m();
18-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
18+
//~^ ERROR avr-interrupt ABI is experimental
1919
extern "avr-non-blocking-interrupt" fn mu();
20-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
20+
//~^ ERROR avr-non-blocking-interrupt ABI is experimental
2121

2222
extern "avr-interrupt" fn dm() {}
23-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
23+
//~^ ERROR avr-interrupt ABI is experimental
2424
extern "avr-non-blocking-interrupt" fn dmu() {}
25-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
25+
//~^ ERROR avr-non-blocking-interrupt ABI is experimental
2626
}
2727

2828
struct S;
2929
impl T for S {
3030
extern "avr-interrupt" fn m() {}
31-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
31+
//~^ ERROR avr-interrupt ABI is experimental
3232
extern "avr-non-blocking-interrupt" fn mu() {}
33-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
33+
//~^ ERROR avr-non-blocking-interrupt ABI is experimental
3434
}
3535

3636
impl S {
3737
extern "avr-interrupt" fn im() {}
38-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
38+
//~^ ERROR avr-interrupt ABI is experimental
3939
extern "avr-non-blocking-interrupt" fn imu() {}
40-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
40+
//~^ ERROR avr-non-blocking-interrupt ABI is experimental
4141
}
4242

4343
type TA = extern "avr-interrupt" fn();
44-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
44+
//~^ ERROR avr-interrupt ABI is experimental
4545
type TAU = extern "avr-non-blocking-interrupt" fn();
46-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
46+
//~^ ERROR avr-non-blocking-interrupt ABI is experimental
4747

4848
extern "avr-interrupt" {}
49-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
49+
//~^ ERROR avr-interrupt ABI is experimental
5050
extern "avr-non-blocking-interrupt" {}
51-
//~^ ERROR avr-interrupt and avr-non-blocking-interrupt ABIs are experimental
51+
//~^ ERROR avr-non-blocking-interrupt ABI is experimental

Diff for: ‎tests/ui/feature-gates/feature-gate-abi-avr-interrupt.stderr

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
1+
error[E0658]: avr-non-blocking-interrupt ABI is experimental and subject to change
22
--> $DIR/feature-gate-abi-avr-interrupt.rs:11:8
33
|
44
LL | extern "avr-non-blocking-interrupt" fn fu() {}
@@ -8,7 +8,7 @@ LL | extern "avr-non-blocking-interrupt" fn fu() {}
88
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
99
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1010

11-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
11+
error[E0658]: avr-interrupt ABI is experimental and subject to change
1212
--> $DIR/feature-gate-abi-avr-interrupt.rs:13:8
1313
|
1414
LL | extern "avr-interrupt" fn f() {}
@@ -18,7 +18,7 @@ LL | extern "avr-interrupt" fn f() {}
1818
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
1919
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
2020

21-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
21+
error[E0658]: avr-interrupt ABI is experimental and subject to change
2222
--> $DIR/feature-gate-abi-avr-interrupt.rs:17:12
2323
|
2424
LL | extern "avr-interrupt" fn m();
@@ -28,7 +28,7 @@ LL | extern "avr-interrupt" fn m();
2828
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
2929
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
3030

31-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
31+
error[E0658]: avr-non-blocking-interrupt ABI is experimental and subject to change
3232
--> $DIR/feature-gate-abi-avr-interrupt.rs:19:12
3333
|
3434
LL | extern "avr-non-blocking-interrupt" fn mu();
@@ -38,7 +38,7 @@ LL | extern "avr-non-blocking-interrupt" fn mu();
3838
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
3939
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
4040

41-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
41+
error[E0658]: avr-interrupt ABI is experimental and subject to change
4242
--> $DIR/feature-gate-abi-avr-interrupt.rs:22:12
4343
|
4444
LL | extern "avr-interrupt" fn dm() {}
@@ -48,7 +48,7 @@ LL | extern "avr-interrupt" fn dm() {}
4848
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
4949
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
5050

51-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
51+
error[E0658]: avr-non-blocking-interrupt ABI is experimental and subject to change
5252
--> $DIR/feature-gate-abi-avr-interrupt.rs:24:12
5353
|
5454
LL | extern "avr-non-blocking-interrupt" fn dmu() {}
@@ -58,7 +58,7 @@ LL | extern "avr-non-blocking-interrupt" fn dmu() {}
5858
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
5959
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
6060

61-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
61+
error[E0658]: avr-interrupt ABI is experimental and subject to change
6262
--> $DIR/feature-gate-abi-avr-interrupt.rs:30:12
6363
|
6464
LL | extern "avr-interrupt" fn m() {}
@@ -68,7 +68,7 @@ LL | extern "avr-interrupt" fn m() {}
6868
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
6969
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
7070

71-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
71+
error[E0658]: avr-non-blocking-interrupt ABI is experimental and subject to change
7272
--> $DIR/feature-gate-abi-avr-interrupt.rs:32:12
7373
|
7474
LL | extern "avr-non-blocking-interrupt" fn mu() {}
@@ -78,7 +78,7 @@ LL | extern "avr-non-blocking-interrupt" fn mu() {}
7878
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
7979
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
8080

81-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
81+
error[E0658]: avr-interrupt ABI is experimental and subject to change
8282
--> $DIR/feature-gate-abi-avr-interrupt.rs:37:12
8383
|
8484
LL | extern "avr-interrupt" fn im() {}
@@ -88,7 +88,7 @@ LL | extern "avr-interrupt" fn im() {}
8888
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
8989
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
9090

91-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
91+
error[E0658]: avr-non-blocking-interrupt ABI is experimental and subject to change
9292
--> $DIR/feature-gate-abi-avr-interrupt.rs:39:12
9393
|
9494
LL | extern "avr-non-blocking-interrupt" fn imu() {}
@@ -98,7 +98,7 @@ LL | extern "avr-non-blocking-interrupt" fn imu() {}
9898
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
9999
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
100100

101-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
101+
error[E0658]: avr-interrupt ABI is experimental and subject to change
102102
--> $DIR/feature-gate-abi-avr-interrupt.rs:43:18
103103
|
104104
LL | type TA = extern "avr-interrupt" fn();
@@ -108,7 +108,7 @@ LL | type TA = extern "avr-interrupt" fn();
108108
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
109109
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
110110

111-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
111+
error[E0658]: avr-non-blocking-interrupt ABI is experimental and subject to change
112112
--> $DIR/feature-gate-abi-avr-interrupt.rs:45:19
113113
|
114114
LL | type TAU = extern "avr-non-blocking-interrupt" fn();
@@ -118,7 +118,7 @@ LL | type TAU = extern "avr-non-blocking-interrupt" fn();
118118
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
119119
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
120120

121-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
121+
error[E0658]: avr-interrupt ABI is experimental and subject to change
122122
--> $DIR/feature-gate-abi-avr-interrupt.rs:48:8
123123
|
124124
LL | extern "avr-interrupt" {}
@@ -128,7 +128,7 @@ LL | extern "avr-interrupt" {}
128128
= help: add `#![feature(abi_avr_interrupt)]` to the crate attributes to enable
129129
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
130130

131-
error[E0658]: avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change
131+
error[E0658]: avr-non-blocking-interrupt ABI is experimental and subject to change
132132
--> $DIR/feature-gate-abi-avr-interrupt.rs:50:8
133133
|
134134
LL | extern "avr-non-blocking-interrupt" {}

Diff for: ‎tests/ui/feature-gates/feature-gate-abi-riscv-interrupt.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ trait Sized {}
99
// feature gate is not used.
1010

1111
extern "riscv-interrupt-m" fn f() {}
12-
//~^ ERROR riscv-interrupt ABIs are experimental
12+
//~^ ERROR riscv-interrupt-m ABI is experimental
1313
extern "riscv-interrupt-s" fn f_s() {}
14-
//~^ ERROR riscv-interrupt ABIs are experimental
14+
//~^ ERROR riscv-interrupt-s ABI is experimental
1515

1616
trait T {
1717
extern "riscv-interrupt-m" fn m();
18-
//~^ ERROR riscv-interrupt ABIs are experimental
18+
//~^ ERROR riscv-interrupt-m ABI is experimental
1919
}
2020

2121
struct S;
2222
impl T for S {
2323
extern "riscv-interrupt-m" fn m() {}
24-
//~^ ERROR riscv-interrupt ABIs are experimental
24+
//~^ ERROR riscv-interrupt-m ABI is experimental
2525
}
2626

2727
impl S {
2828
extern "riscv-interrupt-m" fn im() {}
29-
//~^ ERROR riscv-interrupt ABIs are experimental
29+
//~^ ERROR riscv-interrupt-m ABI is experimental
3030
}
3131

3232
type TA = extern "riscv-interrupt-m" fn();
33-
//~^ ERROR riscv-interrupt ABIs are experimental
33+
//~^ ERROR riscv-interrupt-m ABI is experimental

Diff for: ‎tests/ui/feature-gates/feature-gate-abi-riscv-interrupt.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0658]: riscv-interrupt ABIs are experimental and subject to change
1+
error[E0658]: riscv-interrupt-m ABI is experimental and subject to change
22
--> $DIR/feature-gate-abi-riscv-interrupt.rs:11:8
33
|
44
LL | extern "riscv-interrupt-m" fn f() {}
@@ -8,7 +8,7 @@ LL | extern "riscv-interrupt-m" fn f() {}
88
= help: add `#![feature(abi_riscv_interrupt)]` to the crate attributes to enable
99
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1010

11-
error[E0658]: riscv-interrupt ABIs are experimental and subject to change
11+
error[E0658]: riscv-interrupt-s ABI is experimental and subject to change
1212
--> $DIR/feature-gate-abi-riscv-interrupt.rs:13:8
1313
|
1414
LL | extern "riscv-interrupt-s" fn f_s() {}
@@ -18,7 +18,7 @@ LL | extern "riscv-interrupt-s" fn f_s() {}
1818
= help: add `#![feature(abi_riscv_interrupt)]` to the crate attributes to enable
1919
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
2020

21-
error[E0658]: riscv-interrupt ABIs are experimental and subject to change
21+
error[E0658]: riscv-interrupt-m ABI is experimental and subject to change
2222
--> $DIR/feature-gate-abi-riscv-interrupt.rs:17:12
2323
|
2424
LL | extern "riscv-interrupt-m" fn m();
@@ -28,7 +28,7 @@ LL | extern "riscv-interrupt-m" fn m();
2828
= help: add `#![feature(abi_riscv_interrupt)]` to the crate attributes to enable
2929
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
3030

31-
error[E0658]: riscv-interrupt ABIs are experimental and subject to change
31+
error[E0658]: riscv-interrupt-m ABI is experimental and subject to change
3232
--> $DIR/feature-gate-abi-riscv-interrupt.rs:23:12
3333
|
3434
LL | extern "riscv-interrupt-m" fn m() {}
@@ -38,7 +38,7 @@ LL | extern "riscv-interrupt-m" fn m() {}
3838
= help: add `#![feature(abi_riscv_interrupt)]` to the crate attributes to enable
3939
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
4040

41-
error[E0658]: riscv-interrupt ABIs are experimental and subject to change
41+
error[E0658]: riscv-interrupt-m ABI is experimental and subject to change
4242
--> $DIR/feature-gate-abi-riscv-interrupt.rs:28:12
4343
|
4444
LL | extern "riscv-interrupt-m" fn im() {}
@@ -48,7 +48,7 @@ LL | extern "riscv-interrupt-m" fn im() {}
4848
= help: add `#![feature(abi_riscv_interrupt)]` to the crate attributes to enable
4949
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
5050

51-
error[E0658]: riscv-interrupt ABIs are experimental and subject to change
51+
error[E0658]: riscv-interrupt-m ABI is experimental and subject to change
5252
--> $DIR/feature-gate-abi-riscv-interrupt.rs:32:18
5353
|
5454
LL | type TA = extern "riscv-interrupt-m" fn();

Diff for: ‎tests/ui/feature-gates/feature-gate-abi.rs

+19-19
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,49 @@ trait Sized { }
1111
trait Tuple { }
1212

1313
// Functions
14-
extern "rust-intrinsic" fn f1() {} //~ ERROR intrinsics are subject to change
14+
extern "rust-intrinsic" fn f1() {} //~ ERROR rust-intrinsic ABI is an implementation detail
1515
//~^ ERROR intrinsic must be in
16-
extern "rust-intrinsic" fn f2() {} //~ ERROR intrinsics are subject to change
16+
extern "rust-intrinsic" fn f2() {} //~ ERROR rust-intrinsic ABI is an implementation detail
1717
//~^ ERROR intrinsic must be in
18-
extern "rust-call" fn f4(_: ()) {} //~ ERROR rust-call ABI is subject to change
18+
extern "rust-call" fn f4(_: ()) {} //~ ERROR rust-call ABI is experimental and subject to change
1919

2020
// Methods in trait definition
2121
trait Tr {
22-
extern "rust-intrinsic" fn m1(); //~ ERROR intrinsics are subject to change
22+
extern "rust-intrinsic" fn m1(); //~ ERROR rust-intrinsic ABI is an implementation detail
2323
//~^ ERROR intrinsic must be in
24-
extern "rust-intrinsic" fn m2(); //~ ERROR intrinsics are subject to change
24+
extern "rust-intrinsic" fn m2(); //~ ERROR rust-intrinsic ABI is an implementation detail
2525
//~^ ERROR intrinsic must be in
26-
extern "rust-call" fn m4(_: ()); //~ ERROR rust-call ABI is subject to change
26+
extern "rust-call" fn m4(_: ()); //~ ERROR rust-call ABI is experimental and subject to change
2727

28-
extern "rust-call" fn dm4(_: ()) {} //~ ERROR rust-call ABI is subject to change
28+
extern "rust-call" fn dm4(_: ()) {} //~ ERROR rust-call ABI is experimental and subject to change
2929
}
3030

3131
struct S;
3232

3333
// Methods in trait impl
3434
impl Tr for S {
35-
extern "rust-intrinsic" fn m1() {} //~ ERROR intrinsics are subject to change
35+
extern "rust-intrinsic" fn m1() {} //~ ERROR rust-intrinsic ABI is an implementation detail
3636
//~^ ERROR intrinsic must be in
37-
extern "rust-intrinsic" fn m2() {} //~ ERROR intrinsics are subject to change
37+
extern "rust-intrinsic" fn m2() {} //~ ERROR rust-intrinsic ABI is an implementation detail
3838
//~^ ERROR intrinsic must be in
39-
extern "rust-call" fn m4(_: ()) {} //~ ERROR rust-call ABI is subject to change
39+
extern "rust-call" fn m4(_: ()) {} //~ ERROR rust-call ABI is experimental and subject to change
4040
}
4141

4242
// Methods in inherent impl
4343
impl S {
44-
extern "rust-intrinsic" fn im1() {} //~ ERROR intrinsics are subject to change
44+
extern "rust-intrinsic" fn im1() {} //~ ERROR rust-intrinsic ABI is an implementation detail
4545
//~^ ERROR intrinsic must be in
46-
extern "rust-intrinsic" fn im2() {} //~ ERROR intrinsics are subject to change
46+
extern "rust-intrinsic" fn im2() {} //~ ERROR rust-intrinsic ABI is an implementation detail
4747
//~^ ERROR intrinsic must be in
48-
extern "rust-call" fn im4(_: ()) {} //~ ERROR rust-call ABI is subject to change
48+
extern "rust-call" fn im4(_: ()) {} //~ ERROR rust-call ABI is experimental and subject to change
4949
}
5050

5151
// Function pointer types
52-
type A1 = extern "rust-intrinsic" fn(); //~ ERROR intrinsics are subject to change
53-
type A2 = extern "rust-intrinsic" fn(); //~ ERROR intrinsics are subject to change
54-
type A4 = extern "rust-call" fn(_: ()); //~ ERROR rust-call ABI is subject to change
52+
type A1 = extern "rust-intrinsic" fn(); //~ ERROR rust-intrinsic ABI is an implementation detail
53+
type A2 = extern "rust-intrinsic" fn(); //~ ERROR rust-intrinsic ABI is an implementation detail
54+
type A4 = extern "rust-call" fn(_: ()); //~ ERROR rust-call ABI is experimental and subject to change
5555

5656
// Foreign modules
57-
extern "rust-intrinsic" {} //~ ERROR intrinsics are subject to change
58-
extern "rust-intrinsic" {} //~ ERROR intrinsics are subject to change
59-
extern "rust-call" {} //~ ERROR rust-call ABI is subject to change
57+
extern "rust-intrinsic" {} //~ ERROR rust-intrinsic ABI is an implementation detail
58+
extern "rust-intrinsic" {} //~ ERROR rust-intrinsic ABI is an implementation detail
59+
extern "rust-call" {} //~ ERROR rust-call ABI is experimental and subject to change

0 commit comments

Comments
 (0)