Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 34a5ea9

Browse files
committedFeb 11, 2025·
Auto merge of rust-lang#136878 - matthiaskrgr:rollup-opilhjv, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#135285 (it-self → itself, build-system → build system, type-alias → type alias) - rust-lang#135677 (Small `rustc_resolve` cleanups) - rust-lang#136239 (show supported register classes in error message) - rust-lang#136246 (include note on variance and example) - rust-lang#136354 (Update docs for impl keyword) - rust-lang#136786 (Remove the deduplicate_blocks pass) - rust-lang#136833 (compiler: die immediately instead of handling unknown target codegen) - rust-lang#136847 (Simplify intra-crate qualifiers.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 92bedea + 89ee41c commit 34a5ea9

File tree

46 files changed

+225
-556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+225
-556
lines changed
 

‎compiler/rustc_ast_lowering/messages.ftl

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ ast_lowering_invalid_register =
112112
invalid register `{$reg}`: {$error}
113113
114114
ast_lowering_invalid_register_class =
115-
invalid register class `{$reg_class}`: {$error}
115+
invalid register class `{$reg_class}`: unknown register class
116+
.note = the following register classes are supported on this target: {$supported_register_classes}
116117
117118
ast_lowering_match_arm_with_no_body =
118119
`match` arm with no body

‎compiler/rustc_ast_lowering/src/asm.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
152152
InlineAsmRegOrRegClass::RegClass(reg_class) => {
153153
asm::InlineAsmRegOrRegClass::RegClass(if let Some(asm_arch) = asm_arch {
154154
asm::InlineAsmRegClass::parse(asm_arch, reg_class).unwrap_or_else(
155-
|error| {
155+
|supported_register_classes| {
156+
let mut register_classes =
157+
format!("`{}`", supported_register_classes[0]);
158+
for m in &supported_register_classes[1..] {
159+
let _ = write!(register_classes, ", `{m}`");
160+
}
156161
self.dcx().emit_err(InvalidRegisterClass {
157162
op_span: *op_sp,
158163
reg_class,
159-
error,
164+
supported_register_classes: register_classes,
160165
});
161166
asm::InlineAsmRegClass::Err
162167
},

0 commit comments

Comments
 (0)
Please sign in to comment.