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.

Sign up for GitHub

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

Jump to bottom

More config.toml.example cleanups #108625

Merged
merged 1 commit into from
Mar 27, 2023
Merged

More config.toml.example cleanups #108625

merged 1 commit into from
Mar 27, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Mar 1, 2023

  • 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
Copy link
Collaborator

rustbot commented Mar 1, 2023

r? @albertlarsan68

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

@rustbot 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
albertlarsan68 requested changes Mar 2, 2023
View reviewed changes
Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

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

Overall great, just a few nits and questions.

config.toml.example Outdated Show resolved Hide resolved
config.toml.example Outdated Show resolved Hide resolved
config.toml.example Outdated Show resolved Hide resolved
config.toml.example Outdated Show resolved Hide resolved
config.toml.example Outdated
#
# You can set this to "if-unchanged" to only download if `compiler/` has not been modified.
# You can set this to "if-unchanged" to only download if the compiler and standard library have not been modified.
Copy link
Member

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

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

Copy link
Member

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes.

Copy link
Member Author

Choose a reason for hiding this comment

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

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 Outdated Show resolved Hide resolved
src/bootstrap/defaults/config.user.toml Show resolved Hide resolved
@albertlarsan68 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 jyn514 mentioned this pull request Mar 2, 2023
Closed
@jyn514 jyn514 force-pushed the config-toml-cleanups branch from 89c8bb9 to bcbffa4 Compare March 2, 2023 07:50
albertlarsan68
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
albertlarsan68 reviewed Mar 2, 2023
View reviewed changes
config.toml.example Outdated
#
# You can set this to "if-unchanged" to only download if `compiler/` has not been modified.
# Set this to "if-unchanged" to only download if the compiler and standard library have not been modified.
# Set this to `true` to download unconditionally (useful if e.g. you are only changing doc-comments).
#download-rustc = false
Copy link
Member

Choose a reason for hiding this comment

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

Also, does the test suite passes with this option?

Copy link
Member Author

Choose a reason for hiding this comment

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

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".

@jyn514 jyn514 force-pushed the config-toml-cleanups branch from bcbffa4 to 286b744 Compare March 5, 2023 10:02
@jyn514 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
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 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
@albertlarsan68
Copy link
Member

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 jyn514 force-pushed the config-toml-cleanups branch from 86ec208 to 804d7f7 Compare March 11, 2023 00:12
@jyn514
Copy link
Member Author

jyn514 commented Mar 11, 2023

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
Copy link
Contributor

bors commented Mar 13, 2023

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

@albertlarsan68 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 jyn514 force-pushed the config-toml-cleanups branch from 804d7f7 to d2f6f80 Compare March 18, 2023 05:51
@jyn514 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
@bors
Copy link
Contributor

bors commented Mar 21, 2023

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

@jyn514
Copy link
Member Author

jyn514 commented Mar 21, 2023

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
albertlarsan68 approved these changes Mar 21, 2023
View reviewed changes
Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

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

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

@albertlarsan68 albertlarsan68 removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 21, 2023
@albertlarsan68 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
More config.toml.example cleanups
20ca24e 
- 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 jyn514 force-pushed the config-toml-cleanups branch from d2f6f80 to 20ca24e Compare March 27, 2023 12:08
@jyn514
Copy link
Member Author

jyn514 commented Mar 27, 2023

@bors r=albertlarsan68

@bors
Copy link
Contributor

bors commented Mar 27, 2023

📌 Commit 20ca24e has been approved by albertlarsan68

It is now in the queue for this repository.

@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 Mar 27, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2023
@bors
Auto merge of rust-lang#109662 - matthiaskrgr:rollup-tk2g3jf, r=matth…
dd19135 
…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
@bors bors merged commit 84a7540 into rust-lang:master Mar 27, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@albertlarsan68 albertlarsan68 albertlarsan68 approved these changes

Assignees

@albertlarsan68 albertlarsan68

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
4 participants
@jyn514 @rustbot @albertlarsan68 @bors