More config.toml.example cleanups by jyn514 · Pull Request #108625 · rust-lang/rust

jyn514 · 2023-03-01T21:33:31Z

Link to more documentation
Move changelog-seen into the "Global Settings" section
Update incorrect comments on llvm.link-shared and rust.debug-assertions
Use the correct default in the commented-out example more often
Clarify that docs and compiler-docs only control the default, they're not a hard-off switch.
Document -vvv and local-rebuild
Minor improvements to doc-comments in config.toml.example

This also sets download-rustc = false; that was already the default, but it will be helpful in case the default changes (https://jyn.dev/2023/01/12/Bootstrapping-Rust-in-2023.html).

rustbot · 2023-03-01T21:33:36Z

r? @albertlarsan68

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

albertlarsan68

Overall great, just a few nits and questions.

config.toml.example

albertlarsan68 · 2023-03-02T06:45:09Z

config.toml.example

Does this means that true and "if-unchanged" have the same behavior?

No. true downloads the compiler unconditionally, even if there are changes.

Is is also the case with download-ci-llvm?

Actually download-ci-llvm downloads unconditionally even if you set it to if-available; we might want to improve that at some point but right now we don't even rebuild on changes, so I don't think it's the most pressing issue.

config.toml.example

src/bootstrap/defaults/config.user.toml

config.toml.example

albertlarsan68 · 2023-03-02T08:38:27Z

config.toml.example

Also, does the test suite passes with this option?

All but two of the UI tests pass with this enabled. I opened #108767 to track the two failing tests.

About half the debuginfo tests fail because of rust-lang/simpleinfra#254, I haven't bothered to get them working but I don't think it's related to this option.

The standard library unit tests fail: #108768

tests/run-make/translation fails, but I'm not sure if it's related to this change or not:

error: failed to load fluent bundle: failed to add resource: Attempt to override an existing message: "parse_struct_literal_body_without_path".

config.toml.example

albertlarsan68 · 2023-03-09T06:51:09Z

There is an inconsistency:
Sometimes, to say that a value is the same as another, they are sometimes referred by their full path and sometimes only by their names.

jyn514 · 2023-03-11T00:13:28Z

Ok, fixed.

Can you please switch the labels to S-waiting-on-author after you give feedback? It makes it easier for me to find the PR.

bors · 2023-03-13T00:12:09Z

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

bors · 2023-03-21T15:16:40Z

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

jyn514 · 2023-03-21T15:19:15Z

I am not planning to rebase this until I get a review - let me know if that makes it difficult, but the conflict is in config.user.toml so it shouldn't be too bad.

albertlarsan68

Thanks for the PR!
@bors rollup
r=me once rebased

- Link to more documentation - Move `changelog-seen` into the "Global Settings" section - Update incorrect comments on `llvm.link-shared` and `rust.debug-assertions` - Use the correct default in the commented-out example more often - Clarify that `docs` and `compiler-docs` only control the default, they're not a hard-off switch. - Document `-vvv` and `local-rebuild` - Minor improvements to doc-comments in config.toml.example This also sets `download-rustc = false`; that was already the default, but it will be helpful in case the default changes (https://jyn.dev/2023/01/12/Bootstrapping-Rust-in-2023.html).

jyn514 · 2023-03-27T12:09:50Z

@bors r=albertlarsan68

bors · 2023-03-27T12:09:52Z

📌 Commit 20ca24e has been approved by albertlarsan68

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#108625 (More config.toml.example cleanups) - rust-lang#109418 (Rename 'src/bootstrap/native.rs' to llvm.rs) - rust-lang#109580 (Remove some stale FIXMEs in new solver) - rust-lang#109582 (Refactor: Separate `LocalRef` variant for not-evaluated-yet operands) - rust-lang#109650 (Remove Nilstrieb from review rotation) - rust-lang#109656 (Update cargo) - rust-lang#109658 (Backport 1.68.1 and 1.68.2 release notes to `master`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned albertlarsan68 Mar 1, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 1, 2023

albertlarsan68 requested changes Mar 2, 2023

View reviewed changes

albertlarsan68 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 Mar 2, 2023

jyn514 mentioned this pull request Mar 2, 2023

./configure should set profile = "user" by default #107050

Closed

jyn514 force-pushed the config-toml-cleanups branch from 89c8bb9 to bcbffa4 Compare March 2, 2023 07:50

albertlarsan68 reviewed Mar 2, 2023

View reviewed changes

config.toml.example Outdated Show resolved Hide resolved

config.toml.example Outdated Show resolved Hide resolved

albertlarsan68 reviewed Mar 2, 2023

View reviewed changes

jyn514 force-pushed the config-toml-cleanups branch from bcbffa4 to 286b744 Compare March 5, 2023 10:02

jyn514 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 5, 2023

albertlarsan68 reviewed Mar 5, 2023

View reviewed changes

config.toml.example Outdated Show resolved Hide resolved

config.toml.example Outdated Show resolved Hide resolved

rust-cloud-vms bot force-pushed the config-toml-cleanups branch 2 times, most recently from 1824796 to 86ec208 Compare March 9, 2023 03:58

jyn514 force-pushed the config-toml-cleanups branch from 86ec208 to 804d7f7 Compare March 11, 2023 00:12

albertlarsan68 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 Mar 13, 2023

jyn514 force-pushed the config-toml-cleanups branch from 804d7f7 to d2f6f80 Compare March 18, 2023 05:51

jyn514 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 18, 2023

albertlarsan68 approved these changes Mar 21, 2023

View reviewed changes

albertlarsan68 removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 21, 2023

albertlarsan68 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 21, 2023

jyn514 force-pushed the config-toml-cleanups branch from d2f6f80 to 20ca24e Compare March 27, 2023 12:08

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 Mar 27, 2023

matthiaskrgr mentioned this pull request Mar 27, 2023

Rollup of 7 pull requests #109662

Merged

bors merged commit 84a7540 into rust-lang:master Mar 27, 2023

rustbot added this to the 1.70.0 milestone Mar 27, 2023

Uh oh!

Conversation

jyn514 commented Mar 1, 2023

Uh oh!

rustbot commented Mar 1, 2023

Uh oh!

albertlarsan68 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

albertlarsan68 Mar 2, 2023

Choose a reason for hiding this comment

Uh oh!

jyn514 Mar 2, 2023

Choose a reason for hiding this comment

Uh oh!

albertlarsan68 Mar 2, 2023

Choose a reason for hiding this comment

Uh oh!

jyn514 Mar 5, 2023

Choose a reason for hiding this comment

Uh oh!

jyn514 Mar 5, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

albertlarsan68 Mar 2, 2023

Choose a reason for hiding this comment

Uh oh!

jyn514 Mar 5, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

albertlarsan68 commented Mar 9, 2023

Uh oh!

jyn514 commented Mar 11, 2023

Uh oh!

bors commented Mar 13, 2023

Uh oh!

bors commented Mar 21, 2023

Uh oh!

jyn514 commented Mar 21, 2023

Uh oh!

albertlarsan68 left a comment

Choose a reason for hiding this comment

Uh oh!

jyn514 commented Mar 27, 2023

Uh oh!

bors commented Mar 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants