Rename *.node to *.kind, and hair::Pattern* to hair::Pat*
#64813
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
varkor
changed the title
Expr.node to Expr.kind.(Expr|Pat).node to $1.kind
|
Did you check HAIR as well? |
|
Also it might be easier to merge this if you split it into several PRs (e.g. one for AST, one for HIR, ...). |
|
I'm renaming anything with the same name, so it's easiest to target AST and HIR at once (and HAIR if it has the same names). It'll be more difficult to merge, but I figure it's easier to merge one conflict-prone PR than several. |
varkor
changed the title
(Expr|Pat).node to $1.kind*.node to *.kind for various types
|
The advantage of several smaller PRs is that I can make rollups with them -- and because you would be touching different parts of the compiler, you're unlikely to cause conflicts several times in one PR. |
varkor
changed the title
*.node to *.kind for various types*.node to *.kind
For both `ast::Expr` and `hir::Expr`.
varkor
force-pushed
the
node-to-kind
branch
from
4de6897 to
3812117
Compare
varkor
changed the title
*.node to *.kind*.node to *.kind, and hair::Pattern* to hair::Pat*
|
@bors r+ p=100 rollup=never |
|
📌 Commit ff4ed8c has been approved by |
bors
added
the
S-waiting-on-bors
bors
added
the
S-waiting-on-author
|
@bors r+ |
|
📌 Commit 80b63dd has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Sep 27, 2019
Rename `*.node` to `*.kind`, and `hair::Pattern*` to `hair::Pat*` In both `ast::Expr` and `hir::Expr`: - Rename `Expr.node` to `Expr.kind`. - Rename `Pat.node` to `Pat.kind`. - Rename `ImplItem.node` to `ImplItem.kind`. - Rename `Lit.node` to `Lit.kind`. - Rename `TraitItem.node` to `TraitItem.kind`. - Rename `Ty.node` to `Ty.kind`. - Rename `Stmt.node` to `Stmt.kind`. - Rename `Item.node` to `Item.kind`. - Rename `ForeignItem.node` to `ForeignItem.kind`. - Rename `MetaItem.node` to `MetaItem.kind`. Also: - Rename `hair::FieldPattern` to `hair::FieldPat`. - Rename `hair::PatternKind` to `hair::PatKind`. - Rename `hair::PatternRange` to `hair::PatRange`. - Rename `PatternContext` to `PatCtxt`. - Rename `PatternTypeProjection` to `PatTyProj`. - Rename `hair::Pattern` to `hair::Pat`. These two sets of changes are grouped together to aid with merging. The only changes are renamings. r? @petrochenkov
|
☀️ Test successful - checks-azure |
|
📣 Toolstate changed by #64813! Tested on commit 590ae0e. 💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Sep 27, 2019
Tested on commit rust-lang/rust@590ae0e. Direct link to PR: <rust-lang/rust#64813> 💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
This was referenced Sep 27, 2019
flip1995
added a commit
to flip1995/rust-clippy
that referenced
this pull request
Sep 27, 2019
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Sep 27, 2019
Rustup to rust-lang/rust#64813 cc rust-lang/rust#64843 changelog: none
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Sep 27, 2019
Rustup to rust-lang/rust#64813 cc rust-lang/rust#64843 changelog: none
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Sep 27, 2019
Changes: ```` Remove clippy::author attribute from trailing_zeroes test Move author issue test to author subdir Fix author lint Rustup to rust-lang#64813 Refactor `booleans` Detect assignment ops in integer_arithmetic ````
bors
added a commit
that referenced
this pull request
Sep 27, 2019
submodules: update clippy from 68ff8b1 to edd9047 Changes: ```` Remove clippy::author attribute from trailing_zeroes test Move author issue test to author subdir Fix author lint Rustup to #64813 Refactor `booleans` Detect assignment ops in integer_arithmetic ```` Fixes #64843 r? @oli-obk @Manishearth
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
May 5, 2020
Changes: ```` Remove clippy::author attribute from trailing_zeroes test Move author issue test to author subdir Fix author lint Rustup to rust-lang/rust#64813 Refactor `booleans` Detect assignment ops in integer_arithmetic ````
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In both
ast::Exprandhir::Expr:Expr.nodetoExpr.kind.Pat.nodetoPat.kind.ImplItem.nodetoImplItem.kind.Lit.nodetoLit.kind.TraitItem.nodetoTraitItem.kind.Ty.nodetoTy.kind.Stmt.nodetoStmt.kind.Item.nodetoItem.kind.ForeignItem.nodetoForeignItem.kind.MetaItem.nodetoMetaItem.kind.Also:
hair::FieldPatterntohair::FieldPat.hair::PatternKindtohair::PatKind.hair::PatternRangetohair::PatRange.PatternContexttoPatCtxt.PatternTypeProjectiontoPatTyProj.hair::Patterntohair::Pat.These two sets of changes are grouped together to aid with merging. The only changes are renamings.
r? @petrochenkov