bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #131299 - RalfJung:lang-item-track-caller, r=compiler-errors

Browse source 
fix typo in 'lang item with track_caller' message

Revival of https://github.com/rust-lang/rust/pull/124912
This commit is contained in:
Matthias Krüger 2024-10-05 19:07:55 +02:00 • committed by GitHub
commit 6a85c32f55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_passes/messages.ftl
View file

@ -391,7 +391,7 @@ passes_lang_item_fn_with_target_feature =
passes_lang_item_fn_with_track_caller = passes_lang_item_fn_with_track_caller =
{passes_lang_item_fn} is not allowed to have `#[track_caller]` {passes_lang_item_fn} is not allowed to have `#[track_caller]`
.label = {passes_lang_item_fn} is not allowed to have `#[target_feature]` .label = {passes_lang_item_fn} is not allowed to have `#[track_caller]`
passes_lang_item_on_incorrect_target = passes_lang_item_on_incorrect_target =
`{$name}` lang item must be applied to a {$expected_target} `{$name}` lang item must be applied to a {$expected_target}

2
tests/ui/panic-handler/panic-handler-with-track-caller.stderr
View file

@ -5,7 +5,7 @@ LL | #[track_caller]
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
LL | LL |
LL | fn panic(info: &PanicInfo) -> ! { LL | fn panic(info: &PanicInfo) -> ! {
| ------------------------------- `#[panic_handler]` function is not allowed to have `#[target_feature]` | ------------------------------- `#[panic_handler]` function is not allowed to have `#[track_caller]`
error: aborting due to 1 previous error error: aborting due to 1 previous error