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

metadata: Some crate loading cleanup #65026

Merged
merged 7 commits into from Oct 4, 2019

Conversation

@petrochenkov
Copy link
Contributor

commented Oct 2, 2019

So, my goal was to fix caching of loaded crates which is broken and causes ICEs like #56935 or #64450.
While investigating I found that the code is pretty messy and likes to confuse various things that look similar but are actually different.
This PR does some initial cleanup in that area, I hope to get to the caching itself a bit later.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Oct 2, 2019

r? @eddyb

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

@eddyb
eddyb approved these changes Oct 3, 2019
@eddyb

This comment has been minimized.

Copy link
Member

commented Oct 3, 2019

r=me if ready

@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

commented Oct 3, 2019

@bors r=eddyb

@bors

This comment has been minimized.

Copy link
Contributor

commented Oct 3, 2019

📌 Commit 94525e5 has been approved by eddyb

Centril added a commit to Centril/rust that referenced this pull request Oct 3, 2019
metadata: Some crate loading cleanup

So, my goal was to fix caching of loaded crates which is broken and causes ICEs like rust-lang#56935 or rust-lang#64450.
While investigating I found that the code is pretty messy and likes to confuse various things that look similar but are actually different.
This PR does some initial cleanup in that area, I hope to get to the caching itself a bit later.
bors added a commit that referenced this pull request Oct 3, 2019
Rollup of 10 pull requests

Successful merges:

 - #61879 (Stabilize todo macro)
 - #64675 (Deprecate `#![plugin]` & `#[plugin_registrar]`)
 - #64706 (add regression test for #60218)
 - #64741 (Prevent rustdoc feature doctests)
 - #65004 (Replace mentions of IRC with Discord)
 - #65020 (Always mark rust and rust-call abi's as unwind)
 - #65026 (metadata: Some crate loading cleanup)
 - #65055 (Add long error explanation for E0556)
 - #65056 (Make visit projection iterative)
 - #65057 (typo: fix typo in E0392)

Failed merges:

r? @ghost
@Centril

This comment has been minimized.

Copy link
Member

commented Oct 3, 2019

(Speculative) Failed in #65070 (comment), @bors r-

@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

commented Oct 3, 2019

Oh well, same crate built for two different targets has different crate disambiguators after all.
I'll remove the last commit.

It's entirely irrelevant to crate loading
It's a crate name after renaming, so it's entirely irrelevant to crate loading
It was only used for retreiving edition, which was a bug.
In case of dual proc macros the edition should be taken from the target crate version, like any other metadata.
It duplicates `CrateRoot::name`
@petrochenkov petrochenkov force-pushed the petrochenkov:ice1 branch from 94525e5 to 68aadcb Oct 3, 2019
@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

commented Oct 3, 2019

@bors r=eddyb

@bors

This comment has been minimized.

Copy link
Contributor

commented Oct 3, 2019

📌 Commit 68aadcb has been approved by eddyb

Centril added a commit to Centril/rust that referenced this pull request Oct 4, 2019
metadata: Some crate loading cleanup

So, my goal was to fix caching of loaded crates which is broken and causes ICEs like rust-lang#56935 or rust-lang#64450.
While investigating I found that the code is pretty messy and likes to confuse various things that look similar but are actually different.
This PR does some initial cleanup in that area, I hope to get to the caching itself a bit later.
@Centril Centril referenced this pull request Oct 4, 2019
bors added a commit that referenced this pull request Oct 4, 2019
Rollup of 5 pull requests

Successful merges:

 - #64749 (Fix most remaining Polonius test differences)
 - #64817 (Replace ClosureSubsts with SubstsRef)
 - #64874 (Simplify ExprUseVisitor)
 - #65026 (metadata: Some crate loading cleanup)
 - #65073 (Remove `borrowck_graphviz_postflow` from test)

Failed merges:

r? @ghost
@bors bors merged commit 68aadcb into rust-lang:master Oct 4, 2019
4 checks passed
4 checks passed
pr Build #20191003.76 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.