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

Remove NodeId from more HIR nodes #58754

Merged
merged 12 commits into from
Mar 1, 2019
Merged

Conversation

ljedrz
Copy link
Contributor

@ljedrz ljedrz commented Feb 26, 2019

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-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2019
@Zoxc
Copy link
Contributor

Zoxc commented Feb 26, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Feb 26, 2019

📌 Commit d1b34ba125c1a2a0ffff4c3dc56255da4bd296c5 has been approved by Zoxc

@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 Feb 26, 2019
@Mark-Simulacrum
Copy link
Member

@bors delegate+

@bors
Copy link
Contributor

bors commented Feb 26, 2019

✌️ @ljedrz can now approve this pull request

@bors
Copy link
Contributor

bors commented Feb 27, 2019

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

@bors bors 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
Copy link
Contributor Author

ljedrz commented Feb 27, 2019

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

@Zoxc
Copy link
Contributor

Zoxc commented Feb 27, 2019

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

@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 27, 2019

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

@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 27, 2019

Rebased.

@bors r=Zoxc

@bors
Copy link
Contributor

bors commented Feb 27, 2019

📌 Commit 113aa849e2213d44bce96679908db6244615b4e0 has been approved by Zoxc

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

bors commented Feb 27, 2019

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

@bors bors 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
Copy link
Contributor Author

ljedrz commented Feb 28, 2019

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
Copy link
Contributor

bors commented Feb 28, 2019

📌 Commit 863b9b219f906e6523962ca3f90c2738ac737df8 has been approved by Zoxc

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

bors commented Mar 1, 2019

⌛ Testing commit 863b9b219f906e6523962ca3f90c2738ac737df8 with merge c26df455d90698936e8d4306063d52a658949502...

@mati865
Copy link
Contributor

mati865 commented Mar 1, 2019

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

@ljedrz
Copy link
Contributor Author

ljedrz commented Mar 1, 2019

@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
Copy link
Contributor Author

ljedrz commented Mar 1, 2019

@bors retry

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

ljedrz commented Mar 1, 2019

Hmm, homu doesn't seem to notice.

@bors r=Zoxc

@bors
Copy link
Contributor

bors commented Mar 1, 2019

📌 Commit 9cd1845 has been approved by Zoxc

@bors
Copy link
Contributor

bors commented Mar 1, 2019

⌛ Testing commit 9cd1845 with merge c1d2d83...

bors added a commit that referenced this pull request Mar 1, 2019
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
Copy link
Contributor

bors commented Mar 1, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 1, 2019
@bors bors merged commit 9cd1845 into rust-lang:master Mar 1, 2019
@ljedrz ljedrz deleted the I_hate_NodeIds branch March 1, 2019 18:33
ljedrz added a commit to ljedrz/rust-clippy that referenced this pull request Mar 1, 2019
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.

6 participants