Skip to content

Don't generate unnecessary rmeta files. - #60190

Merged
bors merged 1 commit into
rust-lang:masterfrom
nnethercote:less-metadata-gen
Apr 24, 2019
Merged

Don't generate unnecessary rmeta files.#60190
bors merged 1 commit into
rust-lang:masterfrom
nnethercote:less-metadata-gen

Conversation

@nnethercote

@nnethercotennethercote commented Apr 23, 2019

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2019
@nnethercote
nnethercoteforce-pushed the less-metadata-gen branch 2 times, most recently from 79c73b4 to 0e70582CompareApril 23, 2019 06:15
@nnethercote

nnethercote commented Apr 23, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

@alexcrichton: removing the first rmeta generation as you suggested worked fine. The second one (conditional on it not being a dylib) didn't work... maybe I got the condition wrong? Details are in the comment in the code.

alexcrichton
alexcrichton reviewed Apr 23, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/base.rs Outdated
@nnethercote

nnethercote commented Apr 23, 2019

Copy link
Copy Markdown
ContributorAuthor

@alexcrichton New code is up!

@alexcrichton

alexcrichton commented Apr 23, 2019

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Apr 23, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 8d4ecef7af84564eba78686a308ba0236031321f has been approved by alexcrichton

@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 Apr 23, 2019
@nnethercote

nnethercote commented Apr 23, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r-

@alexcrichton: I realize now that this change should do more -- the creation of metadata_module can be skipped in a lot of cases. I will fix that.

@borsbors 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 Apr 23, 2019
@nnethercote

nnethercote commented Apr 24, 2019

Copy link
Copy Markdown
ContributorAuthor

I ended up only making a tiny change -- I moved the creation of metadata_module later, so it's only created after the early return.

I had thought a bigger change was possible, that I could do the same thing with metadata, but it turns out the first start_async_codegen call needs metadata.

@bors r=alexcrichton

@bors

bors commented Apr 24, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3fc0936 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 24, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 24, 2019
@Centril
Rollup merge ofrust-lang#60190- nnethercote:less-metadata-gen, r=al…
e74cacc
…excrichton
Don't generate unnecessary rmeta files.
As per rust-lang#60006 (comment).
r? @alexcrichton
@CentrilCentril mentioned this pull request Apr 24, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Apr 24, 2019
@Centril
Rollup merge ofrust-lang#60190- nnethercote:less-metadata-gen, r=al…
7304e96
…excrichton
Don't generate unnecessary rmeta files.
As per rust-lang#60006 (comment).
r? @alexcrichton
@CentrilCentril mentioned this pull request Apr 24, 2019
Merged
bors added a commit that referenced this pull request Apr 24, 2019
@bors
Auto merge of#60224- Centril:rollup-lfuhhsk, r=Centril
8a44125
Rollup of 5 pull requests
Successful merges:
- #56278 (Future-proof MIR for dedicated debuginfo.)
- #59739 (Stabilize futures_api)
- #59822 (Fix dark css rule)
- #60186 (Temporarily accept [i|u][32|size] suffixes on a tuple index and warn)
- #60190 (Don't generate unnecessary rmeta files.)
Failed merges:
r? @ghost
@bors
bors merged commit 3fc0936 into rust-lang:masterApr 24, 2019
@nnethercote
nnethercote deleted the less-metadata-gen branch April 24, 2019 06:45
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Apr 26, 2019
Closed
@oli-obkoli-obk mentioned this pull request May 17, 2019
Closed
@oli-obk

oli-obk commented May 17, 2019

Copy link
Copy Markdown
Contributor

This PR broke clippy's test suite. We are using compiletest and are some of our ui tests use serde. Since this PR we're getting

error: extern location for serde does not exist: target/debug/deps/libserde-61a62cbc4921f441.rmeta

I'm assuming this is a compiletest bug or misconfiguration on our side. Any tips? Do we even need that file (like is it just wrongly generating the need for it)? Or do we need to pass a flag so it is generated again?

@ehussehuss mentioned this pull request May 19, 2019
Merged
@ehuss

ehuss commented May 19, 2019

Copy link
Copy Markdown
Contributor

@oli-obk Can you check if rust-lang/rust-clippy#4115 fixes your issue?

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 19, 2019
@bors
Auto merge of#4115- ehuss:fix-compiletest, r=Manishearth
cbae9ed
Fix compile-test from forcing a rebuild.
If the `compile-test` test was run, then running a cargo build command immediately after caused everything to be rebuilt. This is because the `compile-test` test was deleting all `.rmeta` files in the target directory. Cargo recently switched to always generating `.rmeta` files (rust-lang/cargo#6883), and when the files are deleted, it thinks it needs to be rebuilt.
I am not very familiar with compiletest or clippy, so please take a close look and test this out (with the most recent nightly). In particular, make sure it doesn't revert the fixes from #3380 (it seems to work for me). Also @oli-obk mentioned something related in rust-lang/rust#60190 (comment), and I want to make sure that is addressed as well.
Fixes#4114
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexcrichtonalexcrichtonalexcrichton left review comments

Assignees

@alexcrichtonalexcrichton

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.

6 participants

@nnethercote@alexcrichton@bors@oli-obk@ehuss@rust-highfive