compiler: fixup error message for x86-interrupt invalid returns

workingjubilee · workingjubilee · commit 6a628304b883 · 2025-06-26T20:40:21.000-07:00
diff --git a/compiler/rustc_ast_passes/messages.ftl b/compiler/rustc_ast_passes/messages.ftl
@@ -17,7 +17,7 @@ ast_passes_abi_must_not_have_parameters_or_return_type=
 
 ast_passes_abi_must_not_have_return_type=
     invalid signature for `extern {$abi}` function
-    .note = functions with the "custom" ABI cannot have a return type
+    .note = functions with the {$abi} ABI cannot have a return type
     .help = remove the return type
 
 ast_passes_assoc_const_without_body =
diff --git a/tests/ui/abi/interrupt-invalid-signature.i686.stderr b/tests/ui/abi/interrupt-invalid-signature.i686.stderr
@@ -4,7 +4,7 @@ error: invalid signature for `extern "x86-interrupt"` function
 LL | extern "x86-interrupt" fn x86_ret() -> u8 {
    |                                        ^^
    |
-   = note: functions with the "custom" ABI cannot have a return type
+   = note: functions with the "x86-interrupt" ABI cannot have a return type
 help: remove the return type
   --> $DIR/interrupt-invalid-signature.rs:83:40
    |
diff --git a/tests/ui/abi/interrupt-invalid-signature.x64.stderr b/tests/ui/abi/interrupt-invalid-signature.x64.stderr
@@ -4,7 +4,7 @@ error: invalid signature for `extern "x86-interrupt"` function
 LL | extern "x86-interrupt" fn x86_ret() -> u8 {
    |                                        ^^
    |
-   = note: functions with the "custom" ABI cannot have a return type
+   = note: functions with the "x86-interrupt" ABI cannot have a return type
 help: remove the return type
   --> $DIR/interrupt-invalid-signature.rs:83:40
    |

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: invalid signature for `extern "x86-interrupt"` function
`4`	`4`	`LL \| extern "x86-interrupt" fn x86_ret() -> u8 {`
`5`	`5`	`\| ^^`
`6`	`6`	`\|`
`7`		`- = note: functions with the "custom" ABI cannot have a return type`
	`7`	`+ = note: functions with the "x86-interrupt" ABI cannot have a return type`
`8`	`8`	`help: remove the return type`
`9`	`9`	`--> $DIR/interrupt-invalid-signature.rs:83:40`
`10`	`10`	`\|`