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

Rollup of 7 pull requests #62119

Merged
merged 20 commits into from
Jun 25, 2019
Merged

Rollup of 7 pull requests #62119

merged 20 commits into from
Jun 25, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 25, 2019

Successful merges:

Failed merges:

r? @ghost

matthewjasper and others added 20 commits June 22, 2019 15:36
rustc: produce AST instead of HIR from `hir::lowering::Resolver` methods.

This avoids synthesizing HIR nodes in `rustc_resolve`, and `rustc::hir::lowering` patching up the result after the fact (I suspect this is even more significant for @Zoxc's chages to arena-allocate the HIR).

r? @oli-obk
…=pnkfelix

Fix error counting

Count duplicate errors for `track_errors` and other error counting checks.
Add FIXMEs to make it clear that we should be moving away from this kind of logic.

Closes rust-lang#61663
Remove built-in derive macros `Send` and `Sync`

Closes rust-lang#62050
… r=Zoxc

HirIdification: almost there

I'm beginning to run out of stuff to HirIdify 😉.

This time I targeted mainly `hir::map::{find, get_parent_node}`, but a few other bits got changed too.

r? @Zoxc
…bk,Centril

Implement From<Local> for Place and PlaceBase

r? @oli-obk
More tiny bits of Place 2.0 moved into master
@Centril
Copy link
Contributor Author

Centril commented Jun 25, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Jun 25, 2019

📌 Commit d406d89 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 25, 2019
@bors
Copy link
Contributor

bors commented Jun 25, 2019

⌛ Testing commit d406d89 with merge 32b945e49fd969696cbb583dbc8cdcc9761541cb...

@bors
Copy link
Contributor

bors commented Jun 25, 2019

💔 Test failed - status-appveyor

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

Centril commented Jun 25, 2019

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 25, 2019
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 25, 2019
@bors
Copy link
Contributor

bors commented Jun 25, 2019

⌛ Testing commit d406d89 with merge 5f9c044...

bors added a commit that referenced this pull request Jun 25, 2019
Rollup of 7 pull requests

Successful merges:

 - #61814 (Fix an ICE with uninhabited consts)
 - #61987 (rustc: produce AST instead of HIR from `hir::lowering::Resolver` methods.)
 - #62055 (Fix error counting)
 - #62078 (Remove built-in derive macros `Send` and `Sync`)
 - #62085 (Add test for issue-38591)
 - #62091 (HirIdification: almost there)
 - #62096 (Implement From<Local> for Place and PlaceBase)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 25, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 5f9c044 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 25, 2019
@bors bors merged commit d406d89 into rust-lang:master Jun 25, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #62119!

Tested on commit 5f9c044.
Direct link to PR: #62119

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 25, 2019
Tested on commit rust-lang/rust@5f9c044.
Direct link to PR: <rust-lang/rust#62119>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
@Centril Centril deleted the rollup-el20wu0 branch June 25, 2019 21:28
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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. rollup A PR which is a rollup 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.

None yet

10 participants