Skip to content

Make hir().get_generics and generics_of consistent. #97446

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jun 4, 2022

Conversation

cjgillot
Copy link
Contributor

Fetching generics from a HIR node is currently implemented differently in 4 different places.
This PR makes the 4 implementations call the single hir::Node::generics, which implements the more general version from generics_of query.

@rust-highfive
Copy link
Contributor

r? @michaelwoerister

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

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 27, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 27, 2022
@michaelwoerister
Copy link
Member

Looks good to me. Thanks, @cjgillot!

@bors r+ rollup

@cjgillot cjgillot closed this Jun 3, 2022
@cjgillot cjgillot reopened this Jun 3, 2022
@cjgillot
Copy link
Contributor Author

cjgillot commented Jun 3, 2022

@bors r=michaelwoerister rollup

@bors
Copy link
Collaborator

bors commented Jun 3, 2022

📌 Commit f191a65ec4a546ff12949d95273c462a0e007494 has been approved by michaelwoerister

@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 3, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 3, 2022
Rollup of 3 pull requests

Successful merges:

 - rust-lang#97415 (Compute `is_late_bound_map` query separately from lifetime resolution)
 - rust-lang#97471 (Provide more context when denying invalid type params )
 - rust-lang#97681 (Add more eslint checks)

Failed merges:

 - rust-lang#97446 (Make hir().get_generics and generics_of consistent.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Jun 3, 2022

☔ The latest upstream changes (presumably #97694) 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 Jun 3, 2022
@cjgillot
Copy link
Contributor Author

cjgillot commented Jun 3, 2022

@bors r=michaelwoerister rollup

@bors
Copy link
Collaborator

bors commented Jun 3, 2022

📌 Commit 623ea5f has been approved by michaelwoerister

@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 Jun 3, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2022
…askrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#97446 (Make hir().get_generics and generics_of consistent.)
 - rust-lang#97656 (Add a suggestion to replace parentheses with angle brackets on associated trait constraint)
 - rust-lang#97692 (Add `#T-types/nominated` zulip notification)
 - rust-lang#97696 (Do not ICE when failing to normalize during inlining.)
 - rust-lang#97702 (Remove useless LocalDefId in ImplTraitContext::Universal.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e33c6ed into rust-lang:master Jun 4, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 4, 2022
@cjgillot cjgillot deleted the get-generics branch June 4, 2022 07:27
# for free to join this conversation on GitHub. Already have an account? # 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.

5 participants