bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

turn hir::ItemKind::Fn into a named-field variant

Browse source
This commit is contained in:
Ralf Jung 2025-01-04 11:30:31 +01:00
parent c528b8c678
commit be65012aa3
65 changed files with 158 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_passes/src/check_attr.rs
View file

@ -1646,7 +1646,8 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
};
let Some(ItemLike::Item(Item {
kind: ItemKind::Fn(FnSig { decl, .. }, generics, _), ..
kind: ItemKind::Fn { sig: FnSig { decl, .. }, generics, .. },
..
})) = item
else {
bug!("should be a function item");

5
compiler/rustc_passes/src/naked_functions.rs
View file

@ -30,7 +30,10 @@ fn check_mod_naked_functions(tcx: TyCtxt<'_>, module_def_id: LocalModDefId) {
}
let (fn_header, body_id) = match tcx.hir_node_by_def_id(def_id) {
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(sig, _, body_id), .. })
hir::Node::Item(hir::Item {
kind: hir::ItemKind::Fn { sig, body: body_id, .. },
..
})
| hir::Node::TraitItem(hir::TraitItem {
kind: hir::TraitItemKind::Fn(sig, hir::TraitFn::Provided(body_id)),
..

4
compiler/rustc_passes/src/reachable.rs
View file

@ -141,7 +141,7 @@ impl<'tcx> ReachableContext<'tcx> {
match self.tcx.hir_node_by_def_id(def_id) {
Node::Item(item) => match item.kind {
hir::ItemKind::Fn(..) => recursively_reachable(self.tcx, def_id.into()),
hir::ItemKind::Fn { .. } => recursively_reachable(self.tcx, def_id.into()),
_ => false,
},
Node::TraitItem(trait_method) => match trait_method.kind {
@ -200,7 +200,7 @@ impl<'tcx> ReachableContext<'tcx> {
match *node {
Node::Item(item) => {
match item.kind {
hir::ItemKind::Fn(.., body) => {
hir::ItemKind::Fn { body, .. } => {
if recursively_reachable(self.tcx, item.owner_id.into()) {
self.visit_nested_body(body);
}

2
compiler/rustc_passes/src/stability.rs
View file

@ -428,7 +428,7 @@ impl<'a, 'tcx> Visitor<'tcx> for Annotator<'a, 'tcx> {
)
}
}
hir::ItemKind::Fn(ref item_fn_sig, _, _) => {
hir::ItemKind::Fn { sig: ref item_fn_sig, .. } => {
fn_sig = Some(item_fn_sig);
}
_ => {}