Skip to content

Conversation

@dingxiangfei2009
Copy link
Contributor

This is the first effort to decouple HirIds from THIR. HirId is not very relevant in building THIR and MIR.

Based on the changeset, I think there are a few other pending refactoring that we could perform after this, in case we want to eliminate use of HirId in THIR.

  • TypeckResults::closure_min_captures could be remapped from the variable HirIds to LocalVarId while the THIR is getting built.
  • Use of ScopeTree::var_scope could be eliminated as well, since we will consider deprecating ScopeTree in the future.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 9, 2022
@rust-highfive
Copy link
Contributor

r? @wesleywiser

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2022
@nikomatsakis
Copy link
Contributor

r? @nikomatsakis

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 9, 2022

📌 Commit 6cad569 has been approved by nikomatsakis

@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 Jun 9, 2022
@nikomatsakis
Copy link
Contributor

@wesleywiser this is part of a larger refactoring for let-else that I've been working with @dingxiangfei2009 to achieve

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 10, 2022
…r-id, r=nikomatsakis

Wrap `HirId`s of locals into `LocalVarId`s for THIR nodes

This is the first effort to decouple `HirId`s from THIR. `HirId` is not very relevant in building THIR and MIR.

Based on the changeset, I think there are a few other pending refactoring that we could perform after this, in case we want to eliminate use of `HirId` in THIR.
- `TypeckResults::closure_min_captures` could be remapped from the variable `HirId`s to `LocalVarId` while the THIR is getting built.
- Use of `ScopeTree::var_scope` could be eliminated as well, since we will consider deprecating `ScopeTree` in the future.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#97761 (validating the vtable can lead to Stacked Borrows errors)
 - rust-lang#97789 (Fix rust-lang#71363's test by adding `-Z translate-remapped-path-to-local-path=no`)
 - rust-lang#97913 (Wrap `HirId`s of locals into `LocalVarId`s for THIR nodes)
 - rust-lang#97979 (Fix typos in Provider API docs)
 - rust-lang#97987 (remove an unnecessary `String`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 825d280 into rust-lang:master Jun 11, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants