Skip to content

Commit c86212f

Browse files
committed
Auto merge of rust-lang#111858 - clubby789:fluent-alphabetical, r=jyn514,compiler-errors
Ensure Fluent messages are in alphabetical order Fixes rust-lang#111847 This adds a tidy check to ensure Fluent messages are in alphabetical order, as well as sorting all existing messages. I think the error could be worded better, would appreciate suggestions. <details> <summary>Script used to sort files</summary> ```py import sys import re fn = sys.argv[1] with open(fn, 'r') as f: data = f.read().split("\n") chunks = [] cur = "" for line in data: if re.match(r"^([a-zA-Z0-9_]+)\s*=\s*", line): chunks.append(cur) cur = "" cur += line + "\n" chunks.append(cur) chunks.sort() with open(fn, 'w') as f: f.write(''.join(chunks).strip("\n\n") + "\n") ``` </details>
2 parents 0004b3b + f97fdda commit c86212f

File tree

35 files changed

+4042
-3967
lines changed

35 files changed

+4042
-3967
lines changed

Diff for: compiler/rustc_ast_lowering/messages.ftl

+84-84
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,121 @@
1-
ast_lowering_generic_type_with_parentheses =
2-
parenthesized type parameters may only be used with a `Fn` trait
3-
.label = only `Fn` traits may use parentheses
4-
5-
ast_lowering_use_angle_brackets = use angle brackets instead
1+
ast_lowering_abi_specified_multiple_times =
2+
`{$prev_name}` ABI specified multiple times
3+
.label = previously specified here
4+
.note = these ABIs are equivalent on the current target
65
7-
ast_lowering_invalid_abi =
8-
invalid ABI: found `{$abi}`
9-
.label = invalid ABI
10-
.note = invoke `{$command}` for a full list of supported calling conventions.
6+
ast_lowering_arbitrary_expression_in_pattern =
7+
arbitrary expressions aren't allowed in patterns
118
12-
ast_lowering_invalid_abi_suggestion = did you mean
9+
ast_lowering_argument = argument
1310
1411
ast_lowering_assoc_ty_parentheses =
1512
parenthesized generic arguments cannot be used in associated type constraints
1613
17-
ast_lowering_remove_parentheses = remove these parentheses
18-
19-
ast_lowering_misplaced_impl_trait =
20-
`impl Trait` only allowed in function and inherent method return types, not in {$position}
21-
22-
ast_lowering_misplaced_assoc_ty_binding =
23-
associated type bounds are only allowed in where clauses and function signatures, not in {$position}
14+
ast_lowering_async_generators_not_supported =
15+
`async` generators are not yet supported
2416
25-
ast_lowering_underscore_expr_lhs_assign =
26-
in expressions, `_` can only be used on the left-hand side of an assignment
27-
.label = `_` not allowed here
17+
ast_lowering_async_non_move_closure_not_supported =
18+
`async` non-`move` closures with parameters are not currently supported
19+
.help = consider using `let` statements to manually capture variables by reference before entering an `async move` closure
2820
29-
ast_lowering_base_expression_double_dot =
30-
base expression required after `..`
31-
.label = add a base expression here
21+
ast_lowering_att_syntax_only_x86 =
22+
the `att_syntax` option is only supported on x86
3223
3324
ast_lowering_await_only_in_async_fn_and_blocks =
3425
`await` is only allowed inside `async` functions and blocks
3526
.label = only allowed inside `async` functions and blocks
3627
37-
ast_lowering_this_not_async = this is not `async`
28+
ast_lowering_bad_return_type_notation_inputs =
29+
argument types not allowed with return type notation
30+
.suggestion = remove the input types
3831
39-
ast_lowering_generator_too_many_parameters =
40-
too many parameters for a generator (expected 0 or 1 parameters)
32+
ast_lowering_bad_return_type_notation_needs_dots =
33+
return type notation arguments must be elided with `..`
34+
.suggestion = add `..`
35+
36+
ast_lowering_bad_return_type_notation_output =
37+
return type not allowed with return type notation
38+
.suggestion = remove the return type
39+
40+
ast_lowering_base_expression_double_dot =
41+
base expression required after `..`
42+
.label = add a base expression here
43+
44+
ast_lowering_clobber_abi_not_supported =
45+
`clobber_abi` is not supported on this target
4146
4247
ast_lowering_closure_cannot_be_static = closures cannot be static
4348
44-
ast_lowering_async_non_move_closure_not_supported =
45-
`async` non-`move` closures with parameters are not currently supported
46-
.help = consider using `let` statements to manually capture variables by reference before entering an `async move` closure
49+
ast_lowering_does_not_support_modifiers =
50+
the `{$class_name}` register class does not support template modifiers
51+
52+
ast_lowering_extra_double_dot =
53+
`..` can only be used once per {$ctx} pattern
54+
.label = can only be used once per {$ctx} pattern
4755
4856
ast_lowering_functional_record_update_destructuring_assignment =
4957
functional record updates are not allowed in destructuring assignments
5058
.suggestion = consider removing the trailing pattern
5159
52-
ast_lowering_async_generators_not_supported =
53-
`async` generators are not yet supported
60+
ast_lowering_generator_too_many_parameters =
61+
too many parameters for a generator (expected 0 or 1 parameters)
5462
55-
ast_lowering_inline_asm_unsupported_target =
56-
inline assembly is unsupported on this target
63+
ast_lowering_generic_type_with_parentheses =
64+
parenthesized type parameters may only be used with a `Fn` trait
65+
.label = only `Fn` traits may use parentheses
5766
58-
ast_lowering_att_syntax_only_x86 =
59-
the `att_syntax` option is only supported on x86
67+
ast_lowering_inclusive_range_with_no_end = inclusive range with no end
6068
61-
ast_lowering_abi_specified_multiple_times =
62-
`{$prev_name}` ABI specified multiple times
63-
.label = previously specified here
64-
.note = these ABIs are equivalent on the current target
69+
ast_lowering_inline_asm_unsupported_target =
70+
inline assembly is unsupported on this target
6571
66-
ast_lowering_clobber_abi_not_supported =
67-
`clobber_abi` is not supported on this target
72+
ast_lowering_invalid_abi =
73+
invalid ABI: found `{$abi}`
74+
.label = invalid ABI
75+
.note = invoke `{$command}` for a full list of supported calling conventions.
6876
6977
ast_lowering_invalid_abi_clobber_abi =
7078
invalid ABI for `clobber_abi`
7179
.note = the following ABIs are supported on this target: {$supported_abis}
7280
81+
ast_lowering_invalid_abi_suggestion = did you mean
82+
83+
ast_lowering_invalid_asm_template_modifier_const =
84+
asm template modifiers are not allowed for `const` arguments
85+
86+
ast_lowering_invalid_asm_template_modifier_reg_class =
87+
invalid asm template modifier for this register class
88+
89+
ast_lowering_invalid_asm_template_modifier_sym =
90+
asm template modifiers are not allowed for `sym` arguments
91+
7392
ast_lowering_invalid_register =
7493
invalid register `{$reg}`: {$error}
7594
7695
ast_lowering_invalid_register_class =
7796
invalid register class `{$reg_class}`: {$error}
7897
79-
ast_lowering_invalid_asm_template_modifier_reg_class =
80-
invalid asm template modifier for this register class
98+
ast_lowering_misplaced_assoc_ty_binding =
99+
associated type bounds are only allowed in where clauses and function signatures, not in {$position}
81100
82-
ast_lowering_argument = argument
101+
ast_lowering_misplaced_double_dot =
102+
`..` patterns are not allowed here
103+
.note = only allowed in tuple, tuple struct, and slice patterns
83104
84-
ast_lowering_template_modifier = template modifier
105+
ast_lowering_misplaced_impl_trait =
106+
`impl Trait` only allowed in function and inherent method return types, not in {$position}
85107
86-
ast_lowering_support_modifiers =
87-
the `{$class_name}` register class supports the following template modifiers: {$modifiers}
108+
ast_lowering_misplaced_relax_trait_bound =
109+
`?Trait` bounds are only permitted at the point where a type parameter is declared
88110
89-
ast_lowering_does_not_support_modifiers =
90-
the `{$class_name}` register class does not support template modifiers
111+
ast_lowering_not_supported_for_lifetime_binder_async_closure =
112+
`for<...>` binders on `async` closures are not currently supported
91113
92-
ast_lowering_invalid_asm_template_modifier_const =
93-
asm template modifiers are not allowed for `const` arguments
114+
ast_lowering_previously_used_here = previously used here
94115
95-
ast_lowering_invalid_asm_template_modifier_sym =
96-
asm template modifiers are not allowed for `sym` arguments
116+
ast_lowering_register1 = register `{$reg1_name}`
117+
118+
ast_lowering_register2 = register `{$reg2_name}`
97119
98120
ast_lowering_register_class_only_clobber =
99121
register class `{$reg_class_name}` can only be used as a clobber, not as an input or output
@@ -102,9 +124,7 @@ ast_lowering_register_conflict =
102124
register `{$reg1_name}` conflicts with register `{$reg2_name}`
103125
.help = use `lateout` instead of `out` to avoid conflict
104126
105-
ast_lowering_register1 = register `{$reg1_name}`
106-
107-
ast_lowering_register2 = register `{$reg2_name}`
127+
ast_lowering_remove_parentheses = remove these parentheses
108128
109129
ast_lowering_sub_tuple_binding =
110130
`{$ident_name} @` is not allowed in a {$ctx}
@@ -113,41 +133,21 @@ ast_lowering_sub_tuple_binding =
113133
114134
ast_lowering_sub_tuple_binding_suggestion = if you don't need to use the contents of {$ident}, discard the tuple's remaining fields
115135
116-
ast_lowering_extra_double_dot =
117-
`..` can only be used once per {$ctx} pattern
118-
.label = can only be used once per {$ctx} pattern
119-
120-
ast_lowering_previously_used_here = previously used here
121-
122-
ast_lowering_misplaced_double_dot =
123-
`..` patterns are not allowed here
124-
.note = only allowed in tuple, tuple struct, and slice patterns
125-
126-
ast_lowering_misplaced_relax_trait_bound =
127-
`?Trait` bounds are only permitted at the point where a type parameter is declared
128-
129-
ast_lowering_not_supported_for_lifetime_binder_async_closure =
130-
`for<...>` binders on `async` closures are not currently supported
136+
ast_lowering_support_modifiers =
137+
the `{$class_name}` register class supports the following template modifiers: {$modifiers}
131138
132-
ast_lowering_arbitrary_expression_in_pattern =
133-
arbitrary expressions aren't allowed in patterns
139+
ast_lowering_template_modifier = template modifier
134140
135-
ast_lowering_inclusive_range_with_no_end = inclusive range with no end
141+
ast_lowering_this_not_async = this is not `async`
136142
137143
ast_lowering_trait_fn_async =
138144
functions in traits cannot be declared `async`
139145
.label = `async` because of this
140146
.note = `async` trait functions are not currently supported
141147
.note2 = consider using the `async-trait` crate: https://crates.io/crates/async-trait
142148
143-
ast_lowering_bad_return_type_notation_inputs =
144-
argument types not allowed with return type notation
145-
.suggestion = remove the input types
146-
147-
ast_lowering_bad_return_type_notation_needs_dots =
148-
return type notation arguments must be elided with `..`
149-
.suggestion = add `..`
149+
ast_lowering_underscore_expr_lhs_assign =
150+
in expressions, `_` can only be used on the left-hand side of an assignment
151+
.label = `_` not allowed here
150152
151-
ast_lowering_bad_return_type_notation_output =
152-
return type not allowed with return type notation
153-
.suggestion = remove the return type
153+
ast_lowering_use_angle_brackets = use angle brackets instead

0 commit comments

Comments
 (0)