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

HirId to LocalDefId cleanup #109477

Merged
merged 2 commits into from
Mar 23, 2023
Merged

HirId to LocalDefId cleanup #109477

merged 2 commits into from
Mar 23, 2023

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Mar 22, 2023

revival of the still relevant parts of #109125

@rustbot
Copy link
Collaborator

rustbot commented Mar 22, 2023

r? @b-naber

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 22, 2023
@@ -1168,7 +1166,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
})
}
ty::Param(param) => {
let generics = self.tcx.generics_of(hir_id.owner.to_def_id());
let generics = self.tcx.generics_of(body_id);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not exactly equivalent for closures, but the difference doesn't matter.
r=me once CI passes

@lcnr
Copy link
Contributor Author

lcnr commented Mar 22, 2023

@bors r=cjgillot rollup

r? @cjgillot

@bors
Copy link
Contributor

bors commented Mar 22, 2023

📌 Commit 0882def has been approved by cjgillot

It is now in the queue for this repository.

@rustbot rustbot assigned cjgillot and unassigned b-naber Mar 22, 2023
@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 Mar 22, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2023
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#109373 (Set LLVM `LLVM_UNREACHABLE_OPTIMIZE` to `OFF`)
 - rust-lang#109392 (Custom MIR: Allow optional RET type annotation)
 - rust-lang#109394 (adapt tests/codegen/vec-shrink-panik for LLVM 17)
 - rust-lang#109412 (rustdoc: Add GUI test for "Auto-hide item contents for large items" setting)
 - rust-lang#109452 (Ignore the vendor directory for tidy tests.)
 - rust-lang#109457 (Remove comment about reusing rib allocations)
 - rust-lang#109461 (rustdoc: remove redundant `.content` prefix from span/a colors)
 - rust-lang#109477 (`HirId` to `LocalDefId` cleanup)
 - rust-lang#109489 (More general captures)
 - rust-lang#109494 (Do not feed param_env for RPITITs impl side)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 040001e into rust-lang:master Mar 23, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 23, 2023
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