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.

Sign up for GitHub

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

Jump to bottom

Streamline HirCollector #130419

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Streamline HirCollector #130419

merged 3 commits into from
Oct 3, 2024

Conversation

nnethercote
Copy link
Contributor

@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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Sep 16, 2024
@nnethercote
Copy link
Contributor Author

@oli-obk recently added "forbid storing a TyCtxt and a Session in the same struct or use both in function args. Only use tcx" to the list of potential internal compiler lints in #49509. The first commit is an example of this, and the other two are just related cleanups that I found.

@bors
Copy link
Contributor

bors commented Sep 23, 2024

☔ The latest upstream changes (presumably #130724) made this pull request unmergeable. Please resolve the merge conflicts.

@nnethercote
Remove HirCollector::sess.
701ccd3 
It's redundant w.r.t. `HirCollector::tcx`. This removes the unnecessary
`'a` lifetime.
@nnethercote
Remove HirCollector::map.
711c91d 
Because `rustc_middle::hir::map::Map` is a trivial wrapper around
`TyCtxt`, and `HirCollector` has a `TyCtxt` field.
@nnethercote
Rename AstValidator::session as AstValidator::sess.
0882ad5 
Because `sess` is the standard name used everywhere else.
@nnethercote nnethercote force-pushed the streamline-HirCollector branch from 7ad1fcd to 0882ad5 Compare September 25, 2024 11:13
@nnethercote
Copy link
Contributor Author

I fixed the conflicts.

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 3, 2024

📌 Commit 0882ad5 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Oct 3, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 3, 2024
@bors
Auto merge of rust-lang#131196 - matthiaskrgr:rollup-3it3zqp, r=matth…
1e5719b 
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#130419 (Streamline `HirCollector`)
 - rust-lang#131163 (Add `get_line` confusable to `Stdin::read_line()`)
 - rust-lang#131173 (Fix `target_abi` in SOLID targets)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c9b907a into rust-lang:master Oct 3, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 3, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 3, 2024
@rust-timer
Unrolled build for rust-lang#130419
84942fe 
Rollup merge of rust-lang#130419 - nnethercote:streamline-HirCollector, r=GuillaumeGomez

Streamline `HirCollector`

r? `@GuillaumeGomez`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
4 participants
@nnethercote @bors @GuillaumeGomez @rustbot