unsupported_calling_conventions: print which ABI this is about

RalfJung · workingjubilee · commit 1530ca434819 · 2025-06-13T12:12:24.000-07:00
diff --git a/compiler/rustc_hir_analysis/src/check/check.rs b/compiler/rustc_hir_analysis/src/check/check.rs
@@ -63,7 +63,9 @@ pub fn check_abi(tcx: TyCtxt<'_>, hir_id: hir::HirId, span: Span, abi: ExternAbi
         }
         AbiMapping::Deprecated(..) => {
             tcx.node_span_lint(UNSUPPORTED_CALLING_CONVENTIONS, hir_id, span, |lint| {
-                lint.primary_message("use of calling convention not supported on this target");
+                lint.primary_message(format!(
+                    "{abi} is not a supported ABI for the current target"
+                ));
                 add_abi_diag_help(abi, lint);
             });
         }
diff --git a/tests/ui/abi/unsupported.aarch64.stderr b/tests/ui/abi/unsupported.aarch64.stderr
@@ -228,7 +228,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
 LL |     extern "thiscall" fn trait_fn(self) {
    |            ^^^^^^^^^^
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:123:17
    |
 LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
@@ -239,7 +239,7 @@ LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
    = help: use `extern "C"` instead
    = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:128:1
    |
 LL | extern "cdecl" {}
@@ -249,7 +249,7 @@ LL | extern "cdecl" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl-unwind" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:131:1
    |
 LL | extern "cdecl-unwind" {}
@@ -259,7 +259,7 @@ LL | extern "cdecl-unwind" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C-unwind"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:120:1
    |
 LL | extern "cdecl" fn cdecl() {}
diff --git a/tests/ui/abi/unsupported.arm.stderr b/tests/ui/abi/unsupported.arm.stderr
@@ -210,7 +210,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
 LL |     extern "thiscall" fn trait_fn(self) {
    |            ^^^^^^^^^^
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:123:17
    |
 LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
@@ -221,7 +221,7 @@ LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
    = help: use `extern "C"` instead
    = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:128:1
    |
 LL | extern "cdecl" {}
@@ -231,7 +231,7 @@ LL | extern "cdecl" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl-unwind" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:131:1
    |
 LL | extern "cdecl-unwind" {}
@@ -241,7 +241,7 @@ LL | extern "cdecl-unwind" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C-unwind"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:120:1
    |
 LL | extern "cdecl" fn cdecl() {}
diff --git a/tests/ui/abi/unsupported.riscv32.stderr b/tests/ui/abi/unsupported.riscv32.stderr
@@ -210,7 +210,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
 LL |     extern "thiscall" fn trait_fn(self) {
    |            ^^^^^^^^^^
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:123:17
    |
 LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
@@ -221,7 +221,7 @@ LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
    = help: use `extern "C"` instead
    = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:128:1
    |
 LL | extern "cdecl" {}
@@ -231,7 +231,7 @@ LL | extern "cdecl" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl-unwind" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:131:1
    |
 LL | extern "cdecl-unwind" {}
@@ -241,7 +241,7 @@ LL | extern "cdecl-unwind" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C-unwind"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:120:1
    |
 LL | extern "cdecl" fn cdecl() {}
diff --git a/tests/ui/abi/unsupported.riscv64.stderr b/tests/ui/abi/unsupported.riscv64.stderr
@@ -210,7 +210,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
 LL |     extern "thiscall" fn trait_fn(self) {
    |            ^^^^^^^^^^
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:123:17
    |
 LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
@@ -221,7 +221,7 @@ LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
    = help: use `extern "C"` instead
    = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:128:1
    |
 LL | extern "cdecl" {}
@@ -231,7 +231,7 @@ LL | extern "cdecl" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl-unwind" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:131:1
    |
 LL | extern "cdecl-unwind" {}
@@ -241,7 +241,7 @@ LL | extern "cdecl-unwind" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C-unwind"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:120:1
    |
 LL | extern "cdecl" fn cdecl() {}
diff --git a/tests/ui/abi/unsupported.rs b/tests/ui/abi/unsupported.rs
@@ -158,7 +158,7 @@ extern "C-cmse-nonsecure-entry" {}
 #[cfg(windows)]
 #[link(name = "foo", kind = "raw-dylib")]
 extern "cdecl" {}
-//[x64_win]~^ WARN use of calling convention not supported on this target
+//[x64_win]~^ WARN unsupported_calling_conventions
 //[x64_win]~^^ WARN this was previously accepted
 
 struct FnPtrBearer {
diff --git a/tests/ui/abi/unsupported.x64.stderr b/tests/ui/abi/unsupported.x64.stderr
@@ -192,7 +192,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
 LL |     extern "thiscall" fn trait_fn(self) {
    |            ^^^^^^^^^^
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:123:17
    |
 LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
@@ -203,7 +203,7 @@ LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
    = help: use `extern "C"` instead
    = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:128:1
    |
 LL | extern "cdecl" {}
@@ -213,7 +213,7 @@ LL | extern "cdecl" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl-unwind" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:131:1
    |
 LL | extern "cdecl-unwind" {}
@@ -223,7 +223,7 @@ LL | extern "cdecl-unwind" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C-unwind"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:120:1
    |
 LL | extern "cdecl" fn cdecl() {}
diff --git a/tests/ui/abi/unsupported.x64_win.stderr b/tests/ui/abi/unsupported.x64_win.stderr
@@ -160,7 +160,7 @@ error[E0570]: `"thiscall"` is not a supported ABI for the current target
 LL |     extern "thiscall" fn trait_fn(self) {
    |            ^^^^^^^^^^
 
-warning: use of calling convention not supported on this target
+warning: "stdcall" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:105:19
    |
 LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
@@ -171,7 +171,7 @@ LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
    = help: if you need `extern "stdcall"` on win32 and `extern "C"` everywhere else, use `extern "system"`
    = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-warning: use of calling convention not supported on this target
+warning: "stdcall" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:111:1
    |
 LL | extern "stdcall" {}
@@ -181,7 +181,7 @@ LL | extern "stdcall" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: if you need `extern "stdcall"` on win32 and `extern "C"` everywhere else, use `extern "system"`
 
-warning: use of calling convention not supported on this target
+warning: "stdcall-unwind" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:115:1
    |
 LL | extern "stdcall-unwind" {}
@@ -191,7 +191,7 @@ LL | extern "stdcall-unwind" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: if you need `extern "stdcall-unwind"` on win32 and `extern "C-unwind"` everywhere else, use `extern "system-unwind"`
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:123:17
    |
 LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
@@ -201,7 +201,7 @@ LL | fn cdecl_ptr(f: extern "cdecl" fn()) {
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:128:1
    |
 LL | extern "cdecl" {}
@@ -211,7 +211,7 @@ LL | extern "cdecl" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl-unwind" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:131:1
    |
 LL | extern "cdecl-unwind" {}
@@ -221,7 +221,7 @@ LL | extern "cdecl-unwind" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C-unwind"` instead
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:160:1
    |
 LL | extern "cdecl" {}
@@ -231,7 +231,7 @@ LL | extern "cdecl" {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: use `extern "C"` instead
 
-warning: use of calling convention not supported on this target
+warning: "stdcall" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:101:1
    |
 LL | extern "stdcall" fn stdcall() {}
@@ -241,7 +241,7 @@ LL | extern "stdcall" fn stdcall() {}
    = note: for more information, see issue #137018 <https://github.com/rust-lang/rust/issues/137018>
    = help: if you need `extern "stdcall"` on win32 and `extern "C"` everywhere else, use `extern "system"`
 
-warning: use of calling convention not supported on this target
+warning: "cdecl" is not a supported ABI for the current target
   --> $DIR/unsupported.rs:120:1
    |
 LL | extern "cdecl" fn cdecl() {}
diff --git a/tests/ui/linkage-attr/raw-dylib/windows/unsupported-abi.stderr b/tests/ui/linkage-attr/raw-dylib/windows/unsupported-abi.stderr
@@ -1,4 +1,4 @@
-warning: use of calling convention not supported on this target
+warning: "stdcall" is not a supported ABI for the current target
   --> $DIR/unsupported-abi.rs:13:1
    |
 LL | / extern "stdcall" {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ pub fn check_abi(tcx: TyCtxt<'_>, hir_id: hir::HirId, span: Span, abi: ExternAbi`
`63`	`63`	`}`
`64`	`64`	`AbiMapping::Deprecated(..) => {`
`65`	`65`	`tcx.node_span_lint(UNSUPPORTED_CALLING_CONVENTIONS, hir_id, span, \|lint\| {`
`66`		`- lint.primary_message("use of calling convention not supported on this target");`
	`66`	`+ lint.primary_message(format!(`
	`67`	`+ "{abi} is not a supported ABI for the current target"`
	`68`	`+ ));`
`67`	`69`	`add_abi_diag_help(abi, lint);`
`68`	`70`	`});`
`69`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-warning: use of calling convention not supported on this target`
	`1`	`+warning: "stdcall" is not a supported ABI for the current target`
`2`	`2`	`--> $DIR/unsupported-abi.rs:13:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| / extern "stdcall" {`