Skip to content
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

ast: Fix naming conventions in AST structures #90671

Merged
merged 1 commit into from
Nov 7, 2021

Conversation

petrochenkov
Copy link
Contributor

TraitKind -> Trait
TyAliasKind -> TyAlias
ImplKind -> Impl
FnKind -> Fn

All *Kinds in AST are supposed to be enums.

Tuple structs are converted to braced structs for the types above, and fields are reordered in syntactic order.

Also, mutable AST visitor now correctly visit spans in defaultness, unsafety, impl polarity and constness.

Noticed when reviewing #90076.

TraitKind -> Trait
TyAliasKind -> TyAlias
ImplKind -> Impl
FnKind -> Fn

All `*Kind`s in AST are supposed to be enums.

Tuple structs are converted to braced structs for the types above, and fields are reordered in syntactic order.

Also, mutable AST visitor now correctly visit spans in defaultness, unsafety, impl polarity and constness.
@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rust-highfive
Copy link
Collaborator

r? @wesleywiser

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 7, 2021
@jackh726
Copy link
Member

jackh726 commented Nov 7, 2021

r=me with CI green

@calebcartwright
Copy link
Member

I was planning on doing a subtree sync when I saw this. I've recently done a decent amount of refactoring of the impacted code on the rustfmt side which is likely to cause some hefty merge conflicts. Would be good to give bors a high priority on this one to get it landed more quickly since dealing with merge conflicts during subtree syncs is a bit of a pain

@petrochenkov
Copy link
Contributor Author

r? @jackh726
@bors r=jackh726 p=1

@bors
Copy link
Contributor

bors commented Nov 7, 2021

📌 Commit 2834f57 has been approved by jackh726

@rust-highfive rust-highfive assigned jackh726 and unassigned wesleywiser Nov 7, 2021
@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 Nov 7, 2021
@bors
Copy link
Contributor

bors commented Nov 7, 2021

⌛ Testing commit 2834f57 with merge 68568dc...

@bors
Copy link
Contributor

bors commented Nov 7, 2021

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 68568dc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 7, 2021
@bors bors merged commit 68568dc into rust-lang:master Nov 7, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 7, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (68568dc): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants