Skip to content

rustc_metadata: Privatize private code and remove dead code - #65170

Merged
bors merged 5 commits into
rust-lang:masterfrom
petrochenkov:cload
Oct 15, 2019
Merged

rustc_metadata: Privatize private code and remove dead code#65170
bors merged 5 commits into
rust-lang:masterfrom
petrochenkov:cload

Conversation

@petrochenkov

@petrochenkovpetrochenkov commented Oct 6, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Also some minor cleanup and documentation improvements.

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 6, 2019
@JohnCSimon

JohnCSimon commented Oct 12, 2019•
edited
Loading

Copy link
Copy Markdown

Ping from triage
@eddyb can you please review this PR?
@petrochenkov please fix the merge conflict.

thank you

petrochenkov
petrochenkov commented Oct 13, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/lib.rs Outdated

@petrochenkovpetrochenkovOct 13, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't like this.
CrateLoader is an "immutable reference" to some fields in rustc_interface::Compiler plus the result of rustc_interface query crate_name().
(metadata_loader should also migrate from CStore to CrateLoader and it's also a kind of "immutable reference" to rustc_interface::Compiler.)
CrateLoader::new is called from multiple places right now, but it should always return the same thing.
I'll probably try to add a rustc_interface query for it.

I want to split the crate locator configuration (locator::Context) into three parts - immutable per-session configuration, immutable per-search configuration, and mutable output / in-progress state.
CrateLoader is supposed to be the "immutable per-session configuration" in this case, that's why I want to make sure that it's indeed the same all the time.

@petrochenkovpetrochenkovOct 14, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've reverted this bit, CrateLoader is now constructed in the same place as before.
I'll try to do something with it later.

@petrochenkov

petrochenkov commented Oct 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've added a couple more commits.

cc @michaelwoerister, perhaps you can review this if @eddyb is unavailable?

@bors

bors commented Oct 14, 2019

Copy link
Copy Markdown
Collaborator

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

@michaelwoerister

michaelwoerister commented Oct 14, 2019

Copy link
Copy Markdown
Member

@petrochenkov I put it on my todo list.

@eddyb

eddyb commented Oct 14, 2019

Copy link
Copy Markdown
Contributor

Was there another PR with a similar title? For some reason I thought I reviewed this.

@petrochenkov

petrochenkov commented Oct 14, 2019

Copy link
Copy Markdown
ContributorAuthor

Yeah, probably the previous one - #65026.

@eddyb

eddyb commented Oct 14, 2019

Copy link
Copy Markdown
Contributor

r=me after rebase.

@petrochenkov

petrochenkov commented Oct 14, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=eddyb

@bors

bors commented Oct 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit f5baad2 has been approved by eddyb

@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 14, 2019
@bors

bors commented Oct 14, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f5baad2 with merge db0b0c5143f9ccecc648b233f781e4c644678b28...

@rust-highfive

rust-highfive commented Oct 14, 2019

Copy link
Copy Markdown
Contributor

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors

bors commented Oct 14, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 14, 2019
@emilyalbini

emilyalbini commented Oct 14, 2019

Copy link
Copy Markdown
Member

@bors retry azure network error

@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 14, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 15, 2019
@tmandry
Rollup merge ofrust-lang#65170- petrochenkov:cload, r=eddyb
d2f87e3
rustc_metadata: Privatize private code and remove dead code
Also some minor cleanup and documentation improvements.
r? @eddyb
@tmandrytmandry mentioned this pull request Oct 15, 2019
Merged
@bors

bors commented Oct 15, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f5baad2 with merge 592927c191719918d0781e47e5355d7c538739a8...

@tmandry

tmandry commented Oct 15, 2019

Copy link
Copy Markdown
Member

@bors retry rolled up

bors added a commit that referenced this pull request Oct 15, 2019
@bors
Auto merge of#65422- tmandry:rollup-r5u3mlc, r=tmandry
e369d87
Rollup of 10 pull requests
Successful merges:
- #65170 (rustc_metadata: Privatize private code and remove dead code)
- #65260 (Optimize `LexicalResolve::expansion`.)
- #65261 (Remove `Option` from `TokenStream`)
- #65332 (std::fmt: reorder docs)
- #65340 (Several changes to the codegen backend organization)
- #65365 (Include const generic arguments in metadata)
- #65398 (Bring attention to suggestions when the only difference is capitalization)
- #65410 (syntax: add parser recovery for intersection- / and-patterns `p1 @ p2`)
- #65415 (Remove an outdated test output file)
- #65416 (Minor sync changes)
Failed merges:
r? @ghost
@rust-highfive

rust-highfive commented Oct 15, 2019

Copy link
Copy Markdown
Contributor

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors

bors commented Oct 15, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f5baad2 with merge e369d87...

@bors
bors merged commit f5baad2 into rust-lang:masterOct 15, 2019
@petrochenkov
petrochenkov deleted the cload branch February 22, 2025 18:42
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@petrochenkov@JohnCSimon@bors@michaelwoerister@eddyb@rust-highfive@emilyalbini@tmandry