diff options
| author | bors <bors@rust-lang.org> | 2024-12-16 08:26:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-16 08:26:32 +0000 |
| commit | eedc229049b937a007a79ee6fc2801bfc484240e (patch) | |
| tree | 5613145d6c4d180aac1e37d68d7ba701e36bd694 /compiler/rustc_lint/messages.ftl | |
| parent | f2b91ccbc27cb06369aa2dd934ff219e156408a8 (diff) | |
| parent | 0a779720f43aaaa33c67f8b97a9dbb6e1b4fccb8 (diff) | |
| download | rust-eedc229049b937a007a79ee6fc2801bfc484240e.tar.gz rust-eedc229049b937a007a79ee6fc2801bfc484240e.zip | |
Auto merge of #134374 - matthiaskrgr:rollup-2tbbrxq, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #134314 (Make sure to use normalized ty for unevaluated const in default struct value) - #134342 (crashes: more tests) - #134357 (Fix `trimmed_def_paths` ICE in the function ptr comparison lint) - #134369 (Update spelling of "referring") - #134372 (Disable `tests/ui/associated-consts/issue-93775.rs` on windows msvc) Failed merges: - #134365 (Rename `rustc_mir_build::build` to `builder`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_lint/messages.ftl')
| -rw-r--r-- | compiler/rustc_lint/messages.ftl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_lint/messages.ftl b/compiler/rustc_lint/messages.ftl index 48d6d6bbf67..2ecd5051f9e 100644 --- a/compiler/rustc_lint/messages.ftl +++ b/compiler/rustc_lint/messages.ftl @@ -813,7 +813,7 @@ lint_unexpected_cfg_doc_cargo = see <https://doc.rust-lang.org/nightly/rustc/che lint_unexpected_cfg_doc_rustc = see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration lint_unexpected_cfg_from_external_macro_origin = using a cfg inside a {$macro_kind} will use the cfgs from the destination crate and not the ones from the defining crate -lint_unexpected_cfg_from_external_macro_refer = try refering to `{$macro_name}` crate for guidance on how handle this unexpected cfg +lint_unexpected_cfg_from_external_macro_refer = try referring to `{$macro_name}` crate for guidance on how handle this unexpected cfg lint_unexpected_cfg_name = unexpected `cfg` condition name: `{$name}` lint_unexpected_cfg_name_expected_names = expected names are: {$possibilities}{$and_more -> [0] {""} |