Skip to content

Reorder ast::ItemKind::{Struct,Enum,Union} fields. #141675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2025

Conversation

nnethercote
Copy link
Contributor

So they match the order of the parts in the source code, e.g.:

struct Foo<T, U> { t: T, u: U }
       <-><----> <------------>
       /   |       \
   ident generics  variant_data

r? @fee1-dead

So they match the order of the parts in the source code, e.g.:
```
struct Foo<T, U> { t: T, u: U }
       <-><----> <------------>
       /   |       \
   ident generics  variant_data
```
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 28, 2025
@rustbot
Copy link
Collaborator

rustbot commented May 28, 2025

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

@nnethercote
Copy link
Contributor Author

This was particularly bugging me when I was making some changes to the pretty-printer, and the fields were being printed out of order.

@fee1-dead
Copy link
Member

it has the params and also the where clauses, the latter does go after the name.

but this seems fine.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 28, 2025

📌 Commit 4c4a40f has been approved by fee1-dead

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 28, 2025
@nnethercote
Copy link
Contributor Author

it has the params and also the where clauses, the latter does go after the name.

I think the new order still makes sense in that case?

struct Foo<T, U> where T: Copy { t: T, u: U }
       <-><------------------> <------------>
       /          |               \
   ident        generics     variant_data

bors added a commit that referenced this pull request May 29, 2025
Rollup of 16 pull requests

Successful merges:

 - #136429 (GCI: At their def site, actually wfcheck the where-clause & always eval free lifetime-generic constants)
 - #138139 (Emit warning while outputs is not exe and prints linkage info)
 - #141104 (Test(fs): Fix `test_eq_windows_file_type` for Windows 7)
 - #141477 (Path::with_extension: show that it adds an extension where one did no…)
 - #141533 (clean up old rintf leftovers)
 - #141612 (Call out possibility of invariant result in variance markers)
 - #141638 (Use `builtin_index` instead of hand-rolling it)
 - #141643 (ci: verify that codebuild jobs use ghcr.io)
 - #141675 (Reorder `ast::ItemKind::{Struct,Enum,Union}` fields.)
 - #141680 (replace TraitRef link memory.md)
 - #141682 (interpret/allocation: Fixup type for `alloc_bytes`)
 - #141683 (Handle ed2021 precise capturing of unsafe binder)
 - #141684 (rustbook: Bump versions of `onig` and `onig_sys`)
 - #141687 (core: unstably expose atomic_compare_exchange so stdarch can use it)
 - #141690 (Add `rustc_diagnostic_item` to `sys::Mutex` methods)
 - #141702 (Add eholk to compiler reviewer rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0ac0285 into rust-lang:master May 29, 2025
7 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 29, 2025
rust-timer added a commit that referenced this pull request May 29, 2025
Rollup merge of #141675 - nnethercote:ItemKind-field-order, r=fee1-dead

Reorder `ast::ItemKind::{Struct,Enum,Union}` fields.

So they match the order of the parts in the source code, e.g.:
```
struct Foo<T, U> { t: T, u: U }
       <-><----> <------------>
       /   |       \
   ident generics  variant_data
```

r? `@fee1-dead`
flip1995 pushed a commit to flip1995/rust that referenced this pull request May 31, 2025
…r=fee1-dead

Reorder `ast::ItemKind::{Struct,Enum,Union}` fields.

So they match the order of the parts in the source code, e.g.:
```
struct Foo<T, U> { t: T, u: U }
       <-><----> <------------>
       /   |       \
   ident generics  variant_data
```

r? `@fee1-dead`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 31, 2025
…er, r=fee1-dead

Hir item kind field order

A follow-up to rust-lang#141675.

r? `@fee1-dead`
rust-timer added a commit that referenced this pull request May 31, 2025
Rollup merge of #141740 - nnethercote:hir-ItemKind-field-order, r=fee1-dead

Hir item kind field order

A follow-up to #141675.

r? `@fee1-dead`
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jun 2, 2025
Rollup of 16 pull requests

Successful merges:

 - rust-lang/rust#136429 (GCI: At their def site, actually wfcheck the where-clause & always eval free lifetime-generic constants)
 - rust-lang/rust#138139 (Emit warning while outputs is not exe and prints linkage info)
 - rust-lang/rust#141104 (Test(fs): Fix `test_eq_windows_file_type` for Windows 7)
 - rust-lang/rust#141477 (Path::with_extension: show that it adds an extension where one did no…)
 - rust-lang/rust#141533 (clean up old rintf leftovers)
 - rust-lang/rust#141612 (Call out possibility of invariant result in variance markers)
 - rust-lang/rust#141638 (Use `builtin_index` instead of hand-rolling it)
 - rust-lang/rust#141643 (ci: verify that codebuild jobs use ghcr.io)
 - rust-lang/rust#141675 (Reorder `ast::ItemKind::{Struct,Enum,Union}` fields.)
 - rust-lang/rust#141680 (replace TraitRef link memory.md)
 - rust-lang/rust#141682 (interpret/allocation: Fixup type for `alloc_bytes`)
 - rust-lang/rust#141683 (Handle ed2021 precise capturing of unsafe binder)
 - rust-lang/rust#141684 (rustbook: Bump versions of `onig` and `onig_sys`)
 - rust-lang/rust#141687 (core: unstably expose atomic_compare_exchange so stdarch can use it)
 - rust-lang/rust#141690 (Add `rustc_diagnostic_item` to `sys::Mutex` methods)
 - rust-lang/rust#141702 (Add eholk to compiler reviewer rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants