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

rustc: use a separate copy of P for HIR than for AST. #61995

Merged
merged 3 commits into from
Jul 3, 2019

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Jun 20, 2019

Note: this currently includes/is based on top of #61987.

Like #61968, but goes one step further and uses a separate P<...> for the HIR, with no Clone, or the ability to mutate after allocation.
There is still into_inner/into_iter, but they're only exposed for hir::lowering, and they would take more work to untangle.

r? @petrochenkov cc @rust-lang/compiler

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 20, 2019
@bors

This comment has been minimized.

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 22, 2019
@eddyb
Copy link
Member Author

eddyb commented Jul 1, 2019

@petrochenkov Rebased and fixed nits.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2019

📌 Commit c6374cf has been approved by petrochenkov

@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 Jul 1, 2019
@bors
Copy link
Contributor

bors commented Jul 1, 2019

⌛ Testing commit c6374cf with merge 6a21be2954d05f6fb1ebacfa69f78b2556eef00e...

@pietroalbini
Copy link
Member

@bors retry

Yielding priority to the Azure migration.

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 2, 2019
rustc: use a separate copy of P for HIR than for AST.

Note: this currently includes/is based on top of rust-lang#61987.

Like rust-lang#61968, but goes one step further and uses a separate `P<...>` for the HIR, with no `Clone`, or the ability to mutate after allocation.
There is still `into_inner`/`into_iter`, but they're only exposed for `hir::lowering`, and they would take more work to untangle.

r? @petrochenkov cc @rust-lang/compiler
@bors
Copy link
Contributor

bors commented Jul 3, 2019

⌛ Testing commit c6374cf with merge 191b6d1b778c55ec8f274dbc562479af66aa9d8b...

@pietroalbini
Copy link
Member

@bors retry

Yielding priority to the stable rebuild.

@bors
Copy link
Contributor

bors commented Jul 3, 2019

⌛ Testing commit c6374cf with merge 8c6fb02...

bors added a commit that referenced this pull request Jul 3, 2019
rustc: use a separate copy of P for HIR than for AST.

Note: this currently includes/is based on top of #61987.

Like #61968, but goes one step further and uses a separate `P<...>` for the HIR, with no `Clone`, or the ability to mutate after allocation.
There is still `into_inner`/`into_iter`, but they're only exposed for `hir::lowering`, and they would take more work to untangle.

r? @petrochenkov cc @rust-lang/compiler
@bors
Copy link
Contributor

bors commented Jul 3, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: petrochenkov
Pushing 8c6fb02 to master...

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

📣 Toolstate changed by #61995!

Tested on commit 8c6fb02.
Direct link to PR: #61995

💔 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 Jul 3, 2019
Tested on commit rust-lang/rust@8c6fb02.
Direct link to PR: <rust-lang/rust#61995>

💔 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).
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Jul 3, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jul 3, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jul 3, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jul 3, 2019
@eddyb eddyb deleted the hir-sep-ptr branch July 4, 2019 04:21
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 4, 2019
Changes:
````
Remove unused import
rustup rust-lang#61995
Fix allow bug in `trivially_copy_pass_by_ref`
readme: fix urls in the license
Fix `match_same_arms` false negative
Reenable cargo and rls tests in travis
Test for melted ICE rust-lang#4121
Fix `never_loop` false positive
Running rustfmt on test
Removed use of intrinsics::uninit from tests.
Making try_err machine applicable
PR comments
Adding try_err lint
````

Fixes rust-lang#62338
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.

5 participants