user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder hir fn stuff.

Browse source 
In `Fn`, put `ident` next to `generics` as is common in many other
types.

In `print_fn`, make the argument order match the printing order.
This commit is contained in:
Nicholas Nethercote 2025-05-30 00:51:42 +10:00
parent f8887aa5af
commit aa3009dff6
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_ast_lowering/src/item.rs
View file

@ -467,8 +467,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
ItemKind::Delegation(box delegation) => {
let delegation_results = self.lower_delegation(delegation, id, false);
hir::ItemKind::Fn {
ident: delegation_results.ident,
sig: delegation_results.sig,
ident: delegation_results.ident,
generics: delegation_results.generics,
body: delegation_results.body_id,
has_body: true,

2
compiler/rustc_hir/src/hir.rs
View file

@ -4283,8 +4283,8 @@ pub enum ItemKind<'hir> {
Const(Ident, &'hir Generics<'hir>, &'hir Ty<'hir>, BodyId),
/// A function declaration.
Fn {
ident: Ident,
sig: FnSig<'hir>,
ident: Ident,
generics: &'hir Generics<'hir>,
body: BodyId,
/// Whether this function actually has a body.

10
compiler/rustc_hir_pretty/src/lib.rs
View file

@ -477,10 +477,10 @@ impl<'a> State<'a> {
hir::ForeignItemKind::Fn(sig, arg_idents, generics) => {
let (cb, ib) = self.head("");
self.print_fn(
sig.decl,
sig.header,
Some(item.ident.name),
generics,
sig.decl,
arg_idents,
None,
);
@ -626,7 +626,7 @@ impl<'a> State<'a> {
}
hir::ItemKind::Fn { ident, sig, generics, body, .. } => {
let (cb, ib) = self.head("");
self.print_fn(sig.decl, sig.header, Some(ident.name), generics, &[], Some(body));
self.print_fn(sig.header, Some(ident.name), generics, sig.decl, &[], Some(body));
self.word(" ");
self.end(ib);
self.end(cb);
@ -902,7 +902,7 @@ impl<'a> State<'a> {
arg_idents: &[Option<Ident>],
body_id: Option<hir::BodyId>,
) {
self.print_fn(m.decl, m.header, Some(ident.name), generics, arg_idents, body_id);
self.print_fn(m.header, Some(ident.name), generics, m.decl, arg_idents, body_id);
}
fn print_trait_item(&mut self, ti: &hir::TraitItem<'_>) {
@ -2141,10 +2141,10 @@ impl<'a> State<'a> {
fn print_fn(
&mut self,
decl: &hir::FnDecl<'_>,
header: hir::FnHeader,
name: Option<Symbol>,
generics: &hir::Generics<'_>,
decl: &hir::FnDecl<'_>,
arg_idents: &[Option<Ident>],
body_id: Option<hir::BodyId>,
) {
@ -2483,7 +2483,6 @@ impl<'a> State<'a> {
self.print_formal_generic_params(generic_params);
let generics = hir::Generics::empty();
self.print_fn(
decl,
hir::FnHeader {
safety: safety.into(),
abi,
@ -2492,6 +2491,7 @@ impl<'a> State<'a> {
},
name,
generics,
decl,
arg_idents,
None,
);