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

Allow enabling incremental via config.toml #51317

Merged
merged 2 commits into from
Jun 4, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jun 2, 2018

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 2, 2018
@QuietMisdreavus
Copy link
Member

I mean, i'm all for this (we talked about this on IRC) but i'd still want someone like @Mark-Simulacrum to take a look, since i've barely touched rustbuild.

@@ -529,6 +530,7 @@ impl Config {
set(&mut config.rust_dist_src, rust.dist_src);
set(&mut config.quiet_tests, rust.quiet_tests);
set(&mut config.test_miri, rust.test_miri);
set(&mut config.incremental, rust.incremental);
Copy link
Member

Choose a reason for hiding this comment

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

This isn't quite right, since this means that the configuration, if present, will override the command line flags. Instead we should have the command line flags override the configuration.

(I can provide instructions how best to do this if you need help, just let me know).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am aware of that, but there's no flag for disabling incremental. Either the command is there, or it's not. Or are you talking about the case where the config explicitly says "false" but -i is passed?

@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2018
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 3, 2018

📌 Commit 3b02376 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jun 4, 2018
…Mark-Simulacrum

Allow enabling incremental via config.toml

r? @QuietMisdreavus
bors added a commit that referenced this pull request Jun 4, 2018
Rollup of 6 pull requests

Successful merges:

 - #51288 (Remove rustdoc-specific is_import field from HIR)
 - #51299 (const fn integer operations)
 - #51317 (Allow enabling incremental via config.toml)
 - #51323 (Generate br for all two target SwitchInts)
 - #51326 (Various minor slice iterator cleanups)
 - #51329 (Remove the unused `-Z trans-time-graph` flag.)

Failed merges:
@bors bors merged commit 3b02376 into rust-lang:master Jun 4, 2018
@oli-obk oli-obk deleted the incremental_all_the_way branch June 15, 2020 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants