Skip to content

Commit 01b58bd

Browse files
authored
Rollup merge of #121828 - mu001999:clean, r=Nilstrieb
Remove unused fluent messages Unused fluent messages after #121779
2 parents 47a491d + 2064c19 commit 01b58bd

File tree

4 files changed

+0
-33
lines changed

4 files changed

+0
-33
lines changed

compiler/rustc_builtin_macros/messages.ftl

-6
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,6 @@ builtin_macros_requires_cfg_pattern =
221221
macro requires a cfg-pattern as an argument
222222
.label = cfg-pattern required
223223
224-
builtin_macros_should_panic = functions using `#[should_panic]` must return `()`
225-
226-
builtin_macros_test_arg_non_lifetime = functions used as tests can not have any non-lifetime generic parameters
227-
228-
builtin_macros_test_args = functions used as tests can not have any arguments
229-
230224
builtin_macros_test_bad_fn = {$kind} functions cannot be used for tests
231225
.label = `{$kind}` because of this
232226

compiler/rustc_hir_analysis/messages.ftl

-2
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ hir_analysis_missing_one_of_trait_item = not all trait items implemented, missin
239239
.label = missing one of `{$missing_items_msg}` in implementation
240240
.note = required because of this annotation
241241
242-
hir_analysis_missing_tilde_const = missing `~const` qualifier for specialization
243-
244242
hir_analysis_missing_trait_item = not all trait items implemented, missing: `{$missing_items_msg}`
245243
.label = missing `{$missing_items_msg}` in implementation
246244

compiler/rustc_parse/messages.ftl

-3
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,6 @@ parse_found_expr_would_be_stmt = expected expression, found `{$token}`
284284
parse_function_body_equals_expr = function body cannot be `= expression;`
285285
.suggestion = surround the expression with `{"{"}` and `{"}"}` instead of `=` and `;`
286286
287-
parse_gen_fn = `gen` functions are not yet implemented
288-
.help = for now you can use `gen {"{}"}` blocks and return `impl Iterator` instead
289-
290287
parse_generic_args_in_pat_require_turbofish_syntax = generic args in patterns require the turbofish syntax
291288
292289
parse_generic_parameters_without_angle_brackets = generic parameters without surrounding angle brackets

compiler/rustc_resolve/messages.ftl

-22
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ resolve_add_as_non_derive =
88
resolve_added_macro_use =
99
have you added the `#[macro_use]` on the module/import?
1010
11-
resolve_ampersand_used_without_explicit_lifetime_name =
12-
`&` without an explicit lifetime name cannot be used here
13-
.note = explicit lifetime name needed here
14-
1511
resolve_ancestor_only =
1612
visibilities can only be restricted to ancestor modules
1713
@@ -100,12 +96,6 @@ resolve_const_param_in_non_trivial_anon_const =
10096
resolve_const_param_in_ty_of_const_param =
10197
const parameters may not be used in the type of const parameters
10298
103-
resolve_crate_may_not_be_imported =
104-
`$crate` may not be imported
105-
106-
resolve_crate_root_imports_must_be_named_explicitly =
107-
crate root imports need to be explicitly named: `use crate as name;`
108-
10999
resolve_expected_found =
110100
expected module, found {$res} `{$path_str}`
111101
.label = not a module
@@ -220,9 +210,6 @@ resolve_param_in_ty_of_const_param =
220210
the type of const parameters must not depend on other generic parameters
221211
.label = the type must not depend on the parameter `{$name}`
222212
223-
resolve_parent_module_reset_for_binding =
224-
parent module is reset for binding
225-
226213
resolve_proc_macro_same_crate = can't use a procedural macro from the same crate that defines it
227214
.help = you can define integration tests in a directory named `tests`
228215
@@ -270,11 +257,6 @@ resolve_trait_impl_duplicate =
270257
.old_span_label = previous definition here
271258
.trait_item_span = item in trait
272259
273-
resolve_trait_impl_mismatch =
274-
item `{$name}` is an associated {$kind}, which doesn't match its trait `{$trait_path}`
275-
.label = does not match trait
276-
.label_trait_item = item in trait
277-
278260
resolve_try_using_similarly_named_label =
279261
try using similarly named label
280262
@@ -295,10 +277,6 @@ resolve_undeclared_label =
295277
use of undeclared label `{$name}`
296278
.label = undeclared label `{$name}`
297279
298-
resolve_underscore_lifetime_name_cannot_be_used_here =
299-
`'_` cannot be used here
300-
.note = `'_` is a reserved lifetime name
301-
302280
resolve_unexpected_res_change_ty_to_const_param_sugg =
303281
you might have meant to write a const parameter here
304282

0 commit comments

Comments
 (0)