Skip to content

Commit 619b123

Browse files
compiler-errorscompiler-errors
authored
Rollup merge of rust-lang#131675 - tdittr:update-unsupported-abi-message, r=compiler-errors
Update lint message for ABI not supported Tracking issue: rust-lang#130260 As requested in rust-lang#128784 (review) I updated the error message. I could also change it to be the same message as if it was a hard error on a normal function: > "`{abi}` is not a supported ABI for the current target" Or would that get confusing when people try to google the error message? r? compiler-errors
2 parents 4e7a9ff + b6b6c12 commit 619b123

File tree

8 files changed

+57
-57
lines changed

8 files changed

+57
-57
lines changed

‎compiler/rustc_hir_analysis/src/check/check.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ pub fn check_abi_fn_ptr(tcx: TyCtxt<'_>, hir_id: hir::HirId, span: Span, abi: Ab
6161
Some(true) => (),
6262
Some(false) | None => {
6363
tcx.node_span_lint(UNSUPPORTED_FN_PTR_CALLING_CONVENTIONS, hir_id, span, |lint| {
64-
lint.primary_message(
65-
"use of calling convention not supported on this target on function pointer",
66-
);
64+
lint.primary_message(format!(
65+
"the calling convention {abi} is not supported on this target"
66+
));
6767
});
6868
}
6969
}

‎compiler/rustc_lint_defs/src/builtin.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3859,7 +3859,7 @@ declare_lint! {
38593859
/// This will produce:
38603860
///
38613861
/// ```text
3862-
/// warning: use of calling convention not supported on this target on function pointer
3862+
/// warning: the calling convention `"stdcall"` is not supported on this target
38633863
/// --> $DIR/unsupported.rs:34:15
38643864
/// |
38653865
/// LL | fn stdcall_ptr(f: extern "stdcall" fn()) {

‎tests/ui/abi/unsupported.aarch64.stderr‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
warning: use of calling convention not supported on this target on function pointer
1+
warning: the calling convention "ptx-kernel" is not supported on this target
22
--> $DIR/unsupported.rs:35:15
33
|
44
LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
@@ -14,7 +14,7 @@ error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
1414
LL | extern "ptx-kernel" {}
1515
| ^^^^^^^^^^^^^^^^^^^^^^
1616

17-
warning: use of calling convention not supported on this target on function pointer
17+
warning: the calling convention "aapcs" is not supported on this target
1818
--> $DIR/unsupported.rs:49:17
1919
|
2020
LL | fn aapcs_ptr(f: extern "aapcs" fn()) {
@@ -29,7 +29,7 @@ error[E0570]: `"aapcs"` is not a supported ABI for the current target
2929
LL | extern "aapcs" {}
3030
| ^^^^^^^^^^^^^^^^^
3131

32-
warning: use of calling convention not supported on this target on function pointer
32+
warning: the calling convention "msp430-interrupt" is not supported on this target
3333
--> $DIR/unsupported.rs:71:18
3434
|
3535
LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
@@ -44,7 +44,7 @@ error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
4444
LL | extern "msp430-interrupt" {}
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4646

47-
warning: use of calling convention not supported on this target on function pointer
47+
warning: the calling convention "avr-interrupt" is not supported on this target
4848
--> $DIR/unsupported.rs:81:15
4949
|
5050
LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
@@ -59,7 +59,7 @@ error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
5959
LL | extern "avr-interrupt" {}
6060
| ^^^^^^^^^^^^^^^^^^^^^^^^^
6161

62-
warning: use of calling convention not supported on this target on function pointer
62+
warning: the calling convention "riscv-interrupt-m" is not supported on this target
6363
--> $DIR/unsupported.rs:94:17
6464
|
6565
LL | fn riscv_ptr(f: extern "riscv-interrupt-m" fn()) {
@@ -74,7 +74,7 @@ error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current targe
7474
LL | extern "riscv-interrupt-m" {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7676

77-
warning: use of calling convention not supported on this target on function pointer
77+
warning: the calling convention "x86-interrupt" is not supported on this target
7878
--> $DIR/unsupported.rs:116:15
7979
|
8080
LL | fn x86_ptr(f: extern "x86-interrupt" fn()) {
@@ -89,7 +89,7 @@ error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
8989
LL | extern "x86-interrupt" {}
9090
| ^^^^^^^^^^^^^^^^^^^^^^^^^
9191

92-
warning: use of calling convention not supported on this target on function pointer
92+
warning: the calling convention "thiscall" is not supported on this target
9393
--> $DIR/unsupported.rs:139:20
9494
|
9595
LL | fn thiscall_ptr(f: extern "thiscall" fn()) {
@@ -104,7 +104,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
104104
LL | extern "thiscall" {}
105105
| ^^^^^^^^^^^^^^^^^^^^
106106

107-
warning: use of calling convention not supported on this target on function pointer
107+
warning: the calling convention "stdcall" is not supported on this target
108108
--> $DIR/unsupported.rs:170:19
109109
|
110110
LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
@@ -123,7 +123,7 @@ LL | extern "stdcall" {}
123123
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
124124
= note: `#[warn(unsupported_calling_conventions)]` on by default
125125

126-
warning: use of calling convention not supported on this target on function pointer
126+
warning: the calling convention "C-cmse-nonsecure-call" is not supported on this target
127127
--> $DIR/unsupported.rs:195:21
128128
|
129129
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
@@ -132,7 +132,7 @@ LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
132132
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
133133
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
134134

135-
warning: use of calling convention not supported on this target on function pointer
135+
warning: the calling convention "C-cmse-nonsecure-entry" is not supported on this target
136136
--> $DIR/unsupported.rs:203:22
137137
|
138138
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {

‎tests/ui/abi/unsupported.arm.stderr‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
warning: use of calling convention not supported on this target on function pointer
1+
warning: the calling convention "ptx-kernel" is not supported on this target
22
--> $DIR/unsupported.rs:35:15
33
|
44
LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
@@ -14,7 +14,7 @@ error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
1414
LL | extern "ptx-kernel" {}
1515
| ^^^^^^^^^^^^^^^^^^^^^^
1616

17-
warning: use of calling convention not supported on this target on function pointer
17+
warning: the calling convention "msp430-interrupt" is not supported on this target
1818
--> $DIR/unsupported.rs:71:18
1919
|
2020
LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
@@ -29,7 +29,7 @@ error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
2929
LL | extern "msp430-interrupt" {}
3030
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3131

32-
warning: use of calling convention not supported on this target on function pointer
32+
warning: the calling convention "avr-interrupt" is not supported on this target
3333
--> $DIR/unsupported.rs:81:15
3434
|
3535
LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
@@ -44,7 +44,7 @@ error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
4444
LL | extern "avr-interrupt" {}
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^
4646

47-
warning: use of calling convention not supported on this target on function pointer
47+
warning: the calling convention "riscv-interrupt-m" is not supported on this target
4848
--> $DIR/unsupported.rs:94:17
4949
|
5050
LL | fn riscv_ptr(f: extern "riscv-interrupt-m" fn()) {
@@ -59,7 +59,7 @@ error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current targe
5959
LL | extern "riscv-interrupt-m" {}
6060
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6161

62-
warning: use of calling convention not supported on this target on function pointer
62+
warning: the calling convention "x86-interrupt" is not supported on this target
6363
--> $DIR/unsupported.rs:116:15
6464
|
6565
LL | fn x86_ptr(f: extern "x86-interrupt" fn()) {
@@ -74,7 +74,7 @@ error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
7474
LL | extern "x86-interrupt" {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^
7676

77-
warning: use of calling convention not supported on this target on function pointer
77+
warning: the calling convention "thiscall" is not supported on this target
7878
--> $DIR/unsupported.rs:139:20
7979
|
8080
LL | fn thiscall_ptr(f: extern "thiscall" fn()) {
@@ -89,7 +89,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
8989
LL | extern "thiscall" {}
9090
| ^^^^^^^^^^^^^^^^^^^^
9191

92-
warning: use of calling convention not supported on this target on function pointer
92+
warning: the calling convention "stdcall" is not supported on this target
9393
--> $DIR/unsupported.rs:170:19
9494
|
9595
LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
@@ -108,7 +108,7 @@ LL | extern "stdcall" {}
108108
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
109109
= note: `#[warn(unsupported_calling_conventions)]` on by default
110110

111-
warning: use of calling convention not supported on this target on function pointer
111+
warning: the calling convention "C-cmse-nonsecure-call" is not supported on this target
112112
--> $DIR/unsupported.rs:195:21
113113
|
114114
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
@@ -117,7 +117,7 @@ LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
117117
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
118118
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
119119

120-
warning: use of calling convention not supported on this target on function pointer
120+
warning: the calling convention "C-cmse-nonsecure-entry" is not supported on this target
121121
--> $DIR/unsupported.rs:203:22
122122
|
123123
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {

‎tests/ui/abi/unsupported.i686.stderr‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
warning: use of calling convention not supported on this target on function pointer
1+
warning: the calling convention "ptx-kernel" is not supported on this target
22
--> $DIR/unsupported.rs:35:15
33
|
44
LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
@@ -14,7 +14,7 @@ error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
1414
LL | extern "ptx-kernel" {}
1515
| ^^^^^^^^^^^^^^^^^^^^^^
1616

17-
warning: use of calling convention not supported on this target on function pointer
17+
warning: the calling convention "aapcs" is not supported on this target
1818
--> $DIR/unsupported.rs:49:17
1919
|
2020
LL | fn aapcs_ptr(f: extern "aapcs" fn()) {
@@ -29,7 +29,7 @@ error[E0570]: `"aapcs"` is not a supported ABI for the current target
2929
LL | extern "aapcs" {}
3030
| ^^^^^^^^^^^^^^^^^
3131

32-
warning: use of calling convention not supported on this target on function pointer
32+
warning: the calling convention "msp430-interrupt" is not supported on this target
3333
--> $DIR/unsupported.rs:71:18
3434
|
3535
LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
@@ -44,7 +44,7 @@ error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
4444
LL | extern "msp430-interrupt" {}
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4646

47-
warning: use of calling convention not supported on this target on function pointer
47+
warning: the calling convention "avr-interrupt" is not supported on this target
4848
--> $DIR/unsupported.rs:81:15
4949
|
5050
LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
@@ -59,7 +59,7 @@ error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
5959
LL | extern "avr-interrupt" {}
6060
| ^^^^^^^^^^^^^^^^^^^^^^^^^
6161

62-
warning: use of calling convention not supported on this target on function pointer
62+
warning: the calling convention "riscv-interrupt-m" is not supported on this target
6363
--> $DIR/unsupported.rs:94:17
6464
|
6565
LL | fn riscv_ptr(f: extern "riscv-interrupt-m" fn()) {
@@ -74,7 +74,7 @@ error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current targe
7474
LL | extern "riscv-interrupt-m" {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7676

77-
warning: use of calling convention not supported on this target on function pointer
77+
warning: the calling convention "C-cmse-nonsecure-call" is not supported on this target
7878
--> $DIR/unsupported.rs:195:21
7979
|
8080
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
@@ -83,7 +83,7 @@ LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
8383
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
8484
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
8585

86-
warning: use of calling convention not supported on this target on function pointer
86+
warning: the calling convention "C-cmse-nonsecure-entry" is not supported on this target
8787
--> $DIR/unsupported.rs:203:22
8888
|
8989
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {

‎tests/ui/abi/unsupported.riscv32.stderr‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
warning: use of calling convention not supported on this target on function pointer
1+
warning: the calling convention "ptx-kernel" is not supported on this target
22
--> $DIR/unsupported.rs:35:15
33
|
44
LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
@@ -14,7 +14,7 @@ error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
1414
LL | extern "ptx-kernel" {}
1515
| ^^^^^^^^^^^^^^^^^^^^^^
1616

17-
warning: use of calling convention not supported on this target on function pointer
17+
warning: the calling convention "aapcs" is not supported on this target
1818
--> $DIR/unsupported.rs:49:17
1919
|
2020
LL | fn aapcs_ptr(f: extern "aapcs" fn()) {
@@ -29,7 +29,7 @@ error[E0570]: `"aapcs"` is not a supported ABI for the current target
2929
LL | extern "aapcs" {}
3030
| ^^^^^^^^^^^^^^^^^
3131

32-
warning: use of calling convention not supported on this target on function pointer
32+
warning: the calling convention "msp430-interrupt" is not supported on this target
3333
--> $DIR/unsupported.rs:71:18
3434
|
3535
LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
@@ -44,7 +44,7 @@ error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
4444
LL | extern "msp430-interrupt" {}
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4646

47-
warning: use of calling convention not supported on this target on function pointer
47+
warning: the calling convention "avr-interrupt" is not supported on this target
4848
--> $DIR/unsupported.rs:81:15
4949
|
5050
LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
@@ -59,7 +59,7 @@ error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
5959
LL | extern "avr-interrupt" {}
6060
| ^^^^^^^^^^^^^^^^^^^^^^^^^
6161

62-
warning: use of calling convention not supported on this target on function pointer
62+
warning: the calling convention "x86-interrupt" is not supported on this target
6363
--> $DIR/unsupported.rs:116:15
6464
|
6565
LL | fn x86_ptr(f: extern "x86-interrupt" fn()) {
@@ -74,7 +74,7 @@ error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
7474
LL | extern "x86-interrupt" {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^
7676

77-
warning: use of calling convention not supported on this target on function pointer
77+
warning: the calling convention "thiscall" is not supported on this target
7878
--> $DIR/unsupported.rs:139:20
7979
|
8080
LL | fn thiscall_ptr(f: extern "thiscall" fn()) {
@@ -89,7 +89,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
8989
LL | extern "thiscall" {}
9090
| ^^^^^^^^^^^^^^^^^^^^
9191

92-
warning: use of calling convention not supported on this target on function pointer
92+
warning: the calling convention "stdcall" is not supported on this target
9393
--> $DIR/unsupported.rs:170:19
9494
|
9595
LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
@@ -108,7 +108,7 @@ LL | extern "stdcall" {}
108108
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
109109
= note: `#[warn(unsupported_calling_conventions)]` on by default
110110

111-
warning: use of calling convention not supported on this target on function pointer
111+
warning: the calling convention "C-cmse-nonsecure-call" is not supported on this target
112112
--> $DIR/unsupported.rs:195:21
113113
|
114114
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
@@ -117,7 +117,7 @@ LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
117117
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
118118
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
119119

120-
warning: use of calling convention not supported on this target on function pointer
120+
warning: the calling convention "C-cmse-nonsecure-entry" is not supported on this target
121121
--> $DIR/unsupported.rs:203:22
122122
|
123123
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {

0 commit comments

Comments
 (0)