diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-10-05 19:07:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-05 19:07:55 +0200 |
| commit | 6a85c32f55fce74987cb600f23d609bda2360efe (patch) | |
| tree | ce5b664d0ba91cb61832795c9cd6b02b35833e6f | |
| parent | c45f9027230dbde55377d86165b12f50a9f959ad (diff) | |
| parent | 8faf3722ac963a637265c3fb087fce08f9ceb163 (diff) | |
| download | rust-6a85c32f55fce74987cb600f23d609bda2360efe.tar.gz rust-6a85c32f55fce74987cb600f23d609bda2360efe.zip | |
Rollup merge of #131299 - RalfJung:lang-item-track-caller, r=compiler-errors
fix typo in 'lang item with track_caller' message Revival of https://github.com/rust-lang/rust/pull/124912
| -rw-r--r-- | compiler/rustc_passes/messages.ftl | 2 | ||||
| -rw-r--r-- | tests/ui/panic-handler/panic-handler-with-track-caller.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_passes/messages.ftl b/compiler/rustc_passes/messages.ftl index 5369f54afb9..f2682acf8aa 100644 --- a/compiler/rustc_passes/messages.ftl +++ b/compiler/rustc_passes/messages.ftl @@ -391,7 +391,7 @@ passes_lang_item_fn_with_target_feature = passes_lang_item_fn_with_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 = `{$name}` lang item must be applied to a {$expected_target} diff --git a/tests/ui/panic-handler/panic-handler-with-track-caller.stderr b/tests/ui/panic-handler/panic-handler-with-track-caller.stderr index 9ed387fc8d1..605567acdb5 100644 --- a/tests/ui/panic-handler/panic-handler-with-track-caller.stderr +++ b/tests/ui/panic-handler/panic-handler-with-track-caller.stderr @@ -5,7 +5,7 @@ LL | #[track_caller] | ^^^^^^^^^^^^^^^ LL | 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 |