Skip to content

Streamline HirCollector - #130419

Merged
bors merged 3 commits into
rust-lang:masterfrom
nnethercote:streamline-HirCollector
Oct 3, 2024
Merged

Streamline HirCollector#130419
bors merged 3 commits into
rust-lang:masterfrom
nnethercote:streamline-HirCollector

Conversation

@nnethercote

@nnethercotennethercote commented Sep 16, 2024

Copy link
Copy Markdown
Contributor

@rustbotrustbot 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

nnethercote commented Sep 16, 2024

Copy link
Copy Markdown
ContributorAuthor

@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

bors commented Sep 23, 2024

Copy link
Copy Markdown
Collaborator

☔ 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 commented Sep 25, 2024

Copy link
Copy Markdown
ContributorAuthor

I fixed the conflicts.

@GuillaumeGomez

GuillaumeGomez commented Oct 3, 2024

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@bors

bors commented Oct 3, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 0882ad5 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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
@matthiaskrgrmatthiaskrgr 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 ofrust-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:masterOct 3, 2024
@rustbotrustbot 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 forrust-lang#130419
84942fe
Rollup merge of rust-lang#130419 - nnethercote:streamline-HirCollector, r=GuillaumeGomez
Streamline `HirCollector`
r? `@GuillaumeGomez`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant 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