Skip to content

Commit 6a85c32

Browse files
authored
Rollup merge of #131299 - RalfJung:lang-item-track-caller, r=compiler-errors
fix typo in 'lang item with track_caller' message Revival of #124912
2 parents c45f902 + 8faf372 commit 6a85c32

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compiler/rustc_passes/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ passes_lang_item_fn_with_target_feature =
391391
392392
passes_lang_item_fn_with_track_caller =
393393
{passes_lang_item_fn} is not allowed to have `#[track_caller]`
394-
.label = {passes_lang_item_fn} is not allowed to have `#[target_feature]`
394+
.label = {passes_lang_item_fn} is not allowed to have `#[track_caller]`
395395
396396
passes_lang_item_on_incorrect_target =
397397
`{$name}` lang item must be applied to a {$expected_target}

tests/ui/panic-handler/panic-handler-with-track-caller.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | #[track_caller]
55
| ^^^^^^^^^^^^^^^
66
LL |
77
LL | fn panic(info: &PanicInfo) -> ! {
8-
| ------------------------------- `#[panic_handler]` function is not allowed to have `#[target_feature]`
8+
| ------------------------------- `#[panic_handler]` function is not allowed to have `#[track_caller]`
99

1010
error: aborting due to 1 previous error
1111

0 commit comments

Comments
 (0)