Skip to content

Commit 0e567bd

Browse files
committed
move asm parsing code into rustc_parse
1 parent 73f8cdd commit 0e567bd

File tree

11 files changed

+518
-497
lines changed

11 files changed

+518
-497
lines changed

compiler/rustc_builtin_macros/messages.ftl

+4-23
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,6 @@ builtin_macros_asm_duplicate_arg = duplicate argument named `{$name}`
1414
.label = previously here
1515
.arg = duplicate argument
1616
17-
builtin_macros_asm_expected_comma = expected token: `,`
18-
.label = expected `,`
19-
20-
builtin_macros_asm_expected_other = expected operand, {$is_inline_asm ->
21-
[false] options
22-
*[true] clobber_abi, options
23-
}, or additional template string
24-
25-
builtin_macros_asm_expected_string_literal = expected string literal
26-
.label = not a string literal
27-
2817
builtin_macros_asm_explicit_register_name = explicit register arguments cannot have names
2918
3019
builtin_macros_asm_mayunwind = asm labels are not allowed with the `may_unwind` option
@@ -50,17 +39,8 @@ builtin_macros_asm_pure_combine = the `pure` option must be combined with either
5039
5140
builtin_macros_asm_pure_no_output = asm with the `pure` option must have at least one output
5241
53-
builtin_macros_asm_requires_template = requires at least a template string argument
54-
55-
builtin_macros_asm_sym_no_path = expected a path for argument to `sym`
56-
57-
builtin_macros_asm_underscore_input = _ cannot be used for input operands
58-
5942
builtin_macros_asm_unsupported_clobber_abi = `clobber_abi` cannot be used with `{$macro_name}!`
6043
61-
builtin_macros_asm_unsupported_operand = the `{$symbol}` operand cannot be used with `{$macro_name}!`
62-
.label = the `{$symbol}` operand is not meaningful for global-scoped inline assembly, remove it
63-
6444
builtin_macros_asm_unsupported_option = the `{$symbol}` option cannot be used with `{$macro_name}!`
6545
.label = the `{$symbol}` option is not meaningful for global-scoped inline assembly
6646
.suggestion = remove this option
@@ -167,7 +147,10 @@ builtin_macros_expected_comma_in_list = expected token: `,`
167147
168148
builtin_macros_expected_one_cfg_pattern = expected 1 cfg-pattern
169149
170-
builtin_macros_expected_register_class_or_explicit_register = expected register class or explicit register
150+
builtin_macros_expected_other = expected operand, {$is_inline_asm ->
151+
[false] options
152+
*[true] clobber_abi, options
153+
}, or additional template string
171154
172155
builtin_macros_export_macro_rules = cannot export macro_rules! macros from a `proc-macro` crate type currently
173156
@@ -260,8 +243,6 @@ builtin_macros_no_default_variant = `#[derive(Default)]` on enum with no `#[defa
260243
.label = this enum needs a unit variant marked with `#[default]`
261244
.suggestion = make this unit variant default by placing `#[default]` on it
262245
263-
builtin_macros_non_abi = at least one abi must be provided as an argument to `clobber_abi`
264-
265246
builtin_macros_non_exhaustive_default = default variant must be exhaustive
266247
.label = declared `#[non_exhaustive]` here
267248
.help = consider a manual implementation of `Default`

0 commit comments

Comments
 (0)