Skip to content

Commit 006d6eb

Browse files
compiler-errorscompiler-errors
committed
Make asm a named field
1 parent d1fb81e commit 006d6eb

File tree

23 files changed

+30
-28
lines changed

23 files changed

+30
-28
lines changed

Diff for: ‎compiler/rustc_ast_lowering/src/item.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
251251
.arena
252252
.alloc_from_iter(fm.items.iter().map(|x| self.lower_foreign_item_ref(x))),
253253
},
254-
ItemKind::GlobalAsm(asm) => hir::ItemKind::GlobalAsm(self.lower_inline_asm(span, asm)),
254+
ItemKind::GlobalAsm(asm) => {
255+
hir::ItemKind::GlobalAsm { asm: self.lower_inline_asm(span, asm) }
256+
}
255257
ItemKind::TyAlias(box TyAlias { generics, where_clauses, ty, .. }) => {
256258
// We lower
257259
//

Diff for: ‎compiler/rustc_codegen_cranelift/src/global_asm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::prelude::*;
1616

1717
pub(crate) fn codegen_global_asm_item(tcx: TyCtxt<'_>, global_asm: &mut String, item_id: ItemId) {
1818
let item = tcx.hir().item(item_id);
19-
if let rustc_hir::ItemKind::GlobalAsm(asm) = item.kind {
19+
if let rustc_hir::ItemKind::GlobalAsm { asm } = item.kind {
2020
let is_x86 =
2121
matches!(tcx.sess.asm_arch.unwrap(), InlineAsmArch::X86 | InlineAsmArch::X86_64);
2222

Diff for: ‎compiler/rustc_codegen_ssa/src/mono_item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<'a, 'tcx: 'a> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {
3636
}
3737
MonoItem::GlobalAsm(item_id) => {
3838
let item = cx.tcx().hir().item(item_id);
39-
if let hir::ItemKind::GlobalAsm(asm) = item.kind {
39+
if let hir::ItemKind::GlobalAsm { asm } = item.kind {
4040
let operands: Vec<_> = asm
4141
.operands
4242
.iter()

Diff for: ‎compiler/rustc_hir/src/hir.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3848,7 +3848,7 @@ impl<'hir> Item<'hir> {
38483848
expect_foreign_mod, (ExternAbi, &'hir [ForeignItemRef]),
38493849
ItemKind::ForeignMod { abi, items }, (*abi, items);
38503850

3851-
expect_global_asm, &'hir InlineAsm<'hir>, ItemKind::GlobalAsm(asm), asm;
3851+
expect_global_asm, &'hir InlineAsm<'hir>, ItemKind::GlobalAsm { asm }, asm;
38523852

38533853
expect_ty_alias, (&'hir Ty<'hir>, &'hir Generics<'hir>),
38543854
ItemKind::TyAlias(ty, generics), (ty, generics);
@@ -4015,7 +4015,7 @@ pub enum ItemKind<'hir> {
40154015
/// An external module, e.g. `extern { .. }`.
40164016
ForeignMod { abi: ExternAbi, items: &'hir [ForeignItemRef] },
40174017
/// Module-level inline assembly (from `global_asm!`).
4018-
GlobalAsm(&'hir InlineAsm<'hir>),
4018+
GlobalAsm { asm: &'hir InlineAsm<'hir> },
40194019
/// A type alias, e.g., `type Foo = Bar<u8>`.
40204020
TyAlias(&'hir Ty<'hir>, &'hir Generics<'hir>),
40214021
/// An enum definition, e.g., `enum Foo<A, B> {C<A>, D<B>}`.
@@ -4081,7 +4081,7 @@ impl ItemKind<'_> {
40814081
ItemKind::Macro(..) => "macro",
40824082
ItemKind::Mod(..) => "module",
40834083
ItemKind::ForeignMod { .. } => "extern block",
4084-
ItemKind::GlobalAsm(..) => "global asm item",
4084+
ItemKind::GlobalAsm { .. } => "global asm item",
40854085
ItemKind::TyAlias(..) => "type alias",
40864086
ItemKind::Enum(..) => "enum",
40874087
ItemKind::Struct(..) => "struct",

Diff for: ‎compiler/rustc_hir/src/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item<'v>) -> V::
575575
try_visit!(visitor.visit_id(item.hir_id()));
576576
walk_list!(visitor, visit_foreign_item_ref, items);
577577
}
578-
ItemKind::GlobalAsm(asm) => {
578+
ItemKind::GlobalAsm { asm } => {
579579
try_visit!(visitor.visit_id(item.hir_id()));
580580
try_visit!(visitor.visit_inline_asm(asm, item.hir_id()));
581581
}

Diff for: ‎compiler/rustc_hir/src/target.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl Target {
110110
ItemKind::Macro(..) => Target::MacroDef,
111111
ItemKind::Mod(..) => Target::Mod,
112112
ItemKind::ForeignMod { .. } => Target::ForeignMod,
113-
ItemKind::GlobalAsm(..) => Target::GlobalAsm,
113+
ItemKind::GlobalAsm { .. } => Target::GlobalAsm,
114114
ItemKind::TyAlias(..) => Target::TyAlias,
115115
ItemKind::Enum(..) => Target::Enum,
116116
ItemKind::Struct(..) => Target::Struct,

Diff for: ‎compiler/rustc_hir_analysis/src/check/check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ pub(crate) fn check_item_type(tcx: TyCtxt<'_>, def_id: LocalDefId) {
897897
}
898898
DefKind::GlobalAsm => {
899899
let it = tcx.hir().expect_item(def_id);
900-
let hir::ItemKind::GlobalAsm(asm) = it.kind else {
900+
let hir::ItemKind::GlobalAsm { asm } = it.kind else {
901901
span_bug!(it.span, "DefKind::GlobalAsm but got {:#?}", it)
902902
};
903903
InlineAsmCtxt::new_global_asm(tcx).check_asm(asm, def_id);

Diff for: ‎compiler/rustc_hir_analysis/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ fn lower_item(tcx: TyCtxt<'_>, item_id: hir::ItemId) {
680680
| hir::ItemKind::Use(..)
681681
| hir::ItemKind::Macro(..)
682682
| hir::ItemKind::Mod(_)
683-
| hir::ItemKind::GlobalAsm(_) => {}
683+
| hir::ItemKind::GlobalAsm { .. } => {}
684684
hir::ItemKind::ForeignMod { items, .. } => {
685685
for item in *items {
686686
let item = tcx.hir().foreign_item(item.id);

Diff for: ‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
630630
| hir::ItemKind::Mod(..)
631631
| hir::ItemKind::ForeignMod { .. }
632632
| hir::ItemKind::Static(..)
633-
| hir::ItemKind::GlobalAsm(..) => {
633+
| hir::ItemKind::GlobalAsm { .. } => {
634634
// These sorts of items have no lifetime parameters at all.
635635
intravisit::walk_item(self, item);
636636
}

Diff for: ‎compiler/rustc_hir_analysis/src/collect/type_of.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn anon_const_type_of<'tcx>(icx: &ItemCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx
5959

6060
// Anon consts outside the type system.
6161
Node::Expr(&Expr { kind: ExprKind::InlineAsm(asm), .. })
62-
| Node::Item(&Item { kind: ItemKind::GlobalAsm(asm), .. })
62+
| Node::Item(&Item { kind: ItemKind::GlobalAsm { asm }, .. })
6363
if let Some((anon_const, op_sp)) = asm.operands.iter().find_map(find_sym_fn) =>
6464
{
6565
let ty = tcx.typeck(def_id).node_type(hir_id);
@@ -83,7 +83,7 @@ fn anon_const_type_of<'tcx>(icx: &ItemCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx
8383
}
8484
}
8585
Node::Expr(&Expr { kind: ExprKind::InlineAsm(asm), .. })
86-
| Node::Item(&Item { kind: ItemKind::GlobalAsm(asm), .. })
86+
| Node::Item(&Item { kind: ItemKind::GlobalAsm { asm }, .. })
8787
if let Some((anon_const, op_sp)) = asm.operands.iter().find_map(find_const) =>
8888
{
8989
let ty = tcx.typeck(def_id).node_type(hir_id);
@@ -318,7 +318,7 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::EarlyBinder<'_
318318
| ItemKind::Macro(..)
319319
| ItemKind::Mod(..)
320320
| ItemKind::ForeignMod { .. }
321-
| ItemKind::GlobalAsm(..)
321+
| ItemKind::GlobalAsm { .. }
322322
| ItemKind::ExternCrate(..)
323323
| ItemKind::Use(..) => {
324324
span_bug!(item.span, "compute_type_of_item: unexpected item type: {:?}", item.kind);

Diff for: ‎compiler/rustc_hir_pretty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ impl<'a> State<'a> {
692692
}
693693
self.bclose(item.span);
694694
}
695-
hir::ItemKind::GlobalAsm(asm) => {
695+
hir::ItemKind::GlobalAsm { asm } => {
696696
self.head("global_asm!");
697697
self.print_inline_asm(asm);
698698
self.end()

Diff for: ‎compiler/rustc_hir_typeck/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ fn infer_type_if_missing<'tcx>(fcx: &FnCtxt<'_, 'tcx>, node: Node<'tcx>) -> Opti
277277
Some(fcx.next_ty_var(span))
278278
}
279279
Node::Expr(&hir::Expr { kind: hir::ExprKind::InlineAsm(asm), span, .. })
280-
| Node::Item(&hir::Item { kind: hir::ItemKind::GlobalAsm(asm), span, .. }) => {
280+
| Node::Item(&hir::Item { kind: hir::ItemKind::GlobalAsm { asm }, span, .. }) => {
281281
asm.operands.iter().find_map(|(op, _op_sp)| match op {
282282
hir::InlineAsmOperand::Const { anon_const }
283283
| hir::InlineAsmOperand::SymFn { anon_const }

Diff for: ‎compiler/rustc_incremental/src/persist/dirty_clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl<'tcx> DirtyCleanVisitor<'tcx> {
261261
HirItem::ForeignMod { .. } => ("ItemForeignMod", LABELS_HIR_ONLY),
262262

263263
// Module-level inline assembly (from global_asm!)
264-
HirItem::GlobalAsm(..) => ("ItemGlobalAsm", LABELS_HIR_ONLY),
264+
HirItem::GlobalAsm { .. } => ("ItemGlobalAsm", LABELS_HIR_ONLY),
265265

266266
// A type alias, e.g., `type Foo = Bar<u8>`
267267
HirItem::TyAlias(..) => ("ItemTy", LABELS_HIR_ONLY),

Diff for: ‎compiler/rustc_lint/src/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ impl<'tcx> LateLintPass<'tcx> for ImproperCTypesDefinitions {
17401740
hir::ItemKind::Impl(..)
17411741
| hir::ItemKind::TraitAlias(..)
17421742
| hir::ItemKind::Trait(..)
1743-
| hir::ItemKind::GlobalAsm(..)
1743+
| hir::ItemKind::GlobalAsm { .. }
17441744
| hir::ItemKind::ForeignMod { .. }
17451745
| hir::ItemKind::Mod(..)
17461746
| hir::ItemKind::Macro(..)

Diff for: ‎compiler/rustc_middle/src/hir/map/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ fn hir_id_to_string(map: Map<'_>, id: HirId) -> String {
11571157
ItemKind::Macro(..) => "macro",
11581158
ItemKind::Mod(..) => "mod",
11591159
ItemKind::ForeignMod { .. } => "foreign mod",
1160-
ItemKind::GlobalAsm(..) => "global asm",
1160+
ItemKind::GlobalAsm { .. } => "global asm",
11611161
ItemKind::TyAlias(..) => "ty",
11621162
ItemKind::Enum(..) => "enum",
11631163
ItemKind::Struct(..) => "struct",

Diff for: ‎compiler/rustc_monomorphize/src/collector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ fn collect_items_rec<'tcx>(
479479
recursion_depth_reset = None;
480480

481481
let item = tcx.hir().item(item_id);
482-
if let hir::ItemKind::GlobalAsm(asm) = item.kind {
482+
if let hir::ItemKind::GlobalAsm { asm } = item.kind {
483483
for (op, op_sp) in asm.operands {
484484
match op {
485485
hir::InlineAsmOperand::Const { .. } => {

Diff for: ‎compiler/rustc_passes/src/reachable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl<'tcx> ReachableContext<'tcx> {
246246
| hir::ItemKind::Struct(..)
247247
| hir::ItemKind::Enum(..)
248248
| hir::ItemKind::Union(..)
249-
| hir::ItemKind::GlobalAsm(..) => {}
249+
| hir::ItemKind::GlobalAsm { .. } => {}
250250
}
251251
}
252252
Node::TraitItem(trait_method) => {

Diff for: ‎compiler/rustc_privacy/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ impl<'tcx> Visitor<'tcx> for EmbargoVisitor<'tcx> {
645645
// The interface is empty, and no nested items.
646646
hir::ItemKind::Use(..)
647647
| hir::ItemKind::ExternCrate(..)
648-
| hir::ItemKind::GlobalAsm(..) => {}
648+
| hir::ItemKind::GlobalAsm { .. } => {}
649649
// The interface is empty, and all nested items are processed by `visit_item`.
650650
hir::ItemKind::Mod(..) => {}
651651
hir::ItemKind::Macro(macro_def, _) => {

Diff for: ‎src/librustdoc/html/render/span_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ impl<'tcx> Visitor<'tcx> for SpanMapVisitor<'tcx> {
288288
| ItemKind::Use(_, _)
289289
| ItemKind::ExternCrate(_)
290290
| ItemKind::ForeignMod { .. }
291-
| ItemKind::GlobalAsm(_)
291+
| ItemKind::GlobalAsm { .. }
292292
// We already have "visit_mod" above so no need to check it here.
293293
| ItemKind::Mod(_) => {}
294294
}

Diff for: ‎src/librustdoc/visit_ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
439439
}
440440
// If we're inlining, skip private items.
441441
_ if self.inlining && !is_pub => {}
442-
hir::ItemKind::GlobalAsm(..) => {}
442+
hir::ItemKind::GlobalAsm { .. } => {}
443443
hir::ItemKind::Use(_, hir::UseKind::ListStem) => {}
444444
hir::ItemKind::Use(path, kind) => {
445445
for &res in &path.res {

Diff for: ‎src/tools/clippy/clippy_lints/src/arbitrary_source_item_ordering.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ impl<'tcx> LateLintPass<'tcx> for ArbitrarySourceItemOrdering {
362362
}
363363
} else if let ItemKind::ForeignMod { .. } = item.kind {
364364
continue;
365-
} else if let ItemKind::GlobalAsm(_) = item.kind {
365+
} else if let ItemKind::GlobalAsm { .. } = item.kind {
366366
continue;
367367
} else if let ItemKind::Use(path, use_kind) = item.kind {
368368
if path.segments.is_empty() {
@@ -467,7 +467,7 @@ fn convert_module_item_kind(value: &ItemKind<'_>) -> SourceItemOrderingModuleIte
467467
ItemKind::Macro(..) => Macro,
468468
ItemKind::Mod(..) => Mod,
469469
ItemKind::ForeignMod { .. } => ForeignMod,
470-
ItemKind::GlobalAsm(..) => GlobalAsm,
470+
ItemKind::GlobalAsm { .. } => GlobalAsm,
471471
ItemKind::TyAlias(..) => TyAlias,
472472
ItemKind::Enum(..) => Enum,
473473
ItemKind::Struct(..) => Struct,

Diff for: ‎src/tools/clippy/clippy_lints/src/missing_doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
217217
| hir::ItemKind::Union(..) => {},
218218
hir::ItemKind::ExternCrate(..)
219219
| hir::ItemKind::ForeignMod { .. }
220-
| hir::ItemKind::GlobalAsm(..)
220+
| hir::ItemKind::GlobalAsm { .. }
221221
| hir::ItemKind::Impl { .. }
222222
| hir::ItemKind::Use(..) => note_prev_span_then_ret!(self.prev_span, it.span),
223223
}

Diff for: ‎src/tools/clippy/clippy_lints/src/missing_inline.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
128128
| hir::ItemKind::Static(..)
129129
| hir::ItemKind::Struct(..)
130130
| hir::ItemKind::TraitAlias(..)
131-
| hir::ItemKind::GlobalAsm(..)
131+
| hir::ItemKind::GlobalAsm { .. }
132132
| hir::ItemKind::TyAlias(..)
133133
| hir::ItemKind::Union(..)
134134
| hir::ItemKind::ExternCrate(..)

0 commit comments

Comments
 (0)