Skip to content

Remove NodeId from more HIR nodes - #58754

Merged
bors merged 12 commits into
rust-lang:masterfrom
ljedrz:I_hate_NodeIds
Mar 1, 2019
Merged

Remove NodeId from more HIR nodes#58754
bors merged 12 commits into
rust-lang:masterfrom
ljedrz:I_hate_NodeIds

Conversation

@ljedrz

@ljedrzljedrz commented Feb 26, 2019

Copy link
Copy Markdown
Contributor

The next iteration of HirIdification (#57578).

Removes NodeId from:

  • Stmt
  • Local
  • Field
  • AnonConst
  • TraitItem
  • ImplItem
  • TypeBinding
  • Arg
  • TraitRef
  • VisibilityKind

It will most probably break clippy again; I'd appreciate a delegate again if/when it is good to go so I can attach a clippy fix later.

r? @Zoxc

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2019
@Zoxc

Zoxc commented Feb 26, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit d1b34ba125c1a2a0ffff4c3dc56255da4bd296c5 has been approved by Zoxc

@borsbors 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 Feb 26, 2019
@Mark-Simulacrum

Mark-Simulacrum commented Feb 26, 2019

Copy link
Copy Markdown
Member

@bors delegate+

@bors

bors commented Feb 26, 2019

Copy link
Copy Markdown
Collaborator

✌️ @ljedrz can now approve this pull request

@bors

bors commented Feb 27, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #58321) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 27, 2019
ljedrz added a commit to ljedrz/rust-clippy that referenced this pull request Feb 27, 2019
@ljedrz
enablerust-lang/rust#58754
8212b4e
@ljedrz

ljedrz commented Feb 27, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Blocked by rust-lang/rust-clippy#3828.

@Zoxc

Zoxc commented Feb 27, 2019

Copy link
Copy Markdown
Contributor

@ljedrz We can break clippy now, though we don't have to

@ljedrz

ljedrz commented Feb 27, 2019

Copy link
Copy Markdown
ContributorAuthor

Ah, cool; in that case I can let clippy merge the fix when they want.

@ljedrz

ljedrz commented Feb 27, 2019

Copy link
Copy Markdown
ContributorAuthor

Rebased.

@bors r=Zoxc

@bors

bors commented Feb 27, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 113aa849e2213d44bce96679908db6244615b4e0 has been approved by Zoxc

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 27, 2019
@bors

bors commented Feb 27, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #58777) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 27, 2019
@ljedrz

ljedrz commented Feb 28, 2019

Copy link
Copy Markdown
ContributorAuthor

Rebased and attached the clippy update as requested by @flip1995. I'll attempt a priority bump due to submodule update.

@bors r=Zoxc p=1

@bors

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 863b9b219f906e6523962ca3f90c2738ac737df8 has been approved by Zoxc

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 28, 2019
@XanewokXanewok mentioned this pull request Feb 28, 2019
Merged
@bors

bors commented Mar 1, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 863b9b219f906e6523962ca3f90c2738ac737df8 with merge c26df455d90698936e8d4306063d52a658949502...

@mati865

mati865 commented Mar 1, 2019

Copy link
Copy Markdown
Member

@ljedrz you have to fix fix fallout after #58689 or wait until somebody else fixes it.

@ljedrz

ljedrz commented Mar 1, 2019

Copy link
Copy Markdown
ContributorAuthor

@mati865 yeah, I just saw it is not available yet; I don't have enough time to fix it at this moment; I'll push this PR without the clippy update and will follow up with a next one that I'll later append the update to.

@ljedrz

ljedrz commented Mar 1, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors retry

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2019
@ljedrz

ljedrz commented Mar 1, 2019

Copy link
Copy Markdown
ContributorAuthor

Hmm, homu doesn't seem to notice.

@bors r=Zoxc

@bors

bors commented Mar 1, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9cd1845 has been approved by Zoxc

@ljedrzljedrz mentioned this pull request Mar 1, 2019
Merged
8 tasks
@bors

bors commented Mar 1, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9cd1845 with merge c1d2d83...

bors added a commit that referenced this pull request Mar 1, 2019
@bors
Auto merge of#58754- ljedrz:I_hate_NodeIds, r=Zoxc
c1d2d83
Remove NodeId from more HIR nodes
The next iteration of HirIdification (#57578).
Removes `NodeId` from:
- [x] `Stmt`
- [x] `Local`
- [x] `Field`
- [x] `AnonConst`
- [x] `TraitItem`
- [x] `ImplItem`
- [x] `TypeBinding`
- [x] `Arg`
- [x] `TraitRef`
- [x] `VisibilityKind`
It will most probably break clippy again; I'd appreciate a **delegate** again if/when it is good to go so I can attach a clippy fix later.
r? @Zoxc
@bors

bors commented Mar 1, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Zoxc
Pushing c1d2d83 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 1, 2019
@bors
bors merged commit 9cd1845 into rust-lang:masterMar 1, 2019
@ljedrz
ljedrz deleted the I_hate_NodeIds branch March 1, 2019 18:33
This was referenced Mar 1, 2019
Merged
Merged
ljedrz added a commit to ljedrz/rust-clippy that referenced this pull request Mar 1, 2019
@ljedrz
enablerust-lang/rust#58754
f258770
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@ZoxcZoxc

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ljedrz@Zoxc@bors@Mark-Simulacrum@rust-highfive@mati865