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

bootstrap: add std_features config #131315

Merged
merged 1 commit into from
Oct 6, 2024
Merged

bootstrap: add std_features config #131315

merged 1 commit into from
Oct 6, 2024

Conversation

shrirambalaji
Copy link
Contributor

@shrirambalaji shrirambalaji commented Oct 6, 2024 •
edited
Loading

Adding support for a std-features config under the rust section in config.toml during bootstrap. This allows rustc devs to build with specific feature flags for local development.

@shrirambalaji
bootstrap: add std_features config
8b96876 
bootstrap: add std_features  to config.example

fix: use BTreeSet for std-features; add unit tests

* fix formatting of string in front of std_features
* rename `std_features` to `std-features` in config.toml

fix: remove space before std-features in config.toml

fix: remove explicit .into_iter conversion

bootstrap: add details for rust.std-features in config.example.toml

Co-authored-by: Onur Özkan <onurozkan.dev@outlook.com>

fix: remove `Option<T>` from `rust_std_features`

fix: move default rust_std_features to config

fix: make std_features CI rustc incompatible
@rustbot
Copy link
Collaborator

rustbot commented Oct 6, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @albertlarsan68 (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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 Oct 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 6, 2024

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@shrirambalaji
Copy link
Contributor Author

@rustbot review

@shrirambalaji
Copy link
Contributor Author

shrirambalaji commented Oct 6, 2024 •
edited
Loading

@onur-ozkan Reopening: #130241
(sorry I seemed to have messed up the squash, without pulling upstream correctly, and force pushed)

@shrirambalaji
Copy link
Contributor Author

r? onur-ozkan

@rustbot rustbot assigned onur-ozkan and unassigned albertlarsan68 Oct 6, 2024
@onur-ozkan
Copy link
Member

Looks good to me, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Oct 6, 2024

📌 Commit 8b96876 has been approved by onur-ozkan

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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 6, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 6, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 6, 2024
@bors
Auto merge of rust-lang#131320 - matthiaskrgr:rollup-tom15b3, r=matth…
9a1592b 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#129392 (Do not consider match/let/ref of place that evaluates to `!` to diverge, disallow coercions from them too)
 - rust-lang#131279 (update "build/host" symlink comment)
 - rust-lang#131312 (On function and method calls in patterns, link to the book)
 - rust-lang#131315 (bootstrap: add `std_features` config)
 - rust-lang#131316 (Fix typo in primitive_docs.rs)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 6, 2024
@bors
Auto merge of rust-lang#131320 - matthiaskrgr:rollup-tom15b3, r=matth…
96d9d8a 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#129392 (Do not consider match/let/ref of place that evaluates to `!` to diverge, disallow coercions from them too)
 - rust-lang#131279 (update "build/host" symlink comment)
 - rust-lang#131312 (On function and method calls in patterns, link to the book)
 - rust-lang#131315 (bootstrap: add `std_features` config)
 - rust-lang#131316 (Fix typo in primitive_docs.rs)

r? `@ghost`
`@rustbot` modify labels: rollup
@shrirambalaji
Copy link
Contributor Author

thank you @onur-ozkan for helping me land my first contribution!

@bors bors merged commit 3c4bc7d into rust-lang:master Oct 6, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 6, 2024
@rust-timer
Unrolled build for rust-lang#131315
36fe025 
Rollup merge of rust-lang#131315 - shrirambalaji:issue-129599-fix-shrirambalaji, r=onur-ozkan

bootstrap: add `std_features` config

Adding support for a std-features config under the rust section in config.toml during bootstrap. This allows rustc devs to build with specific feature flags for local development.
@ismailarilik
Copy link
Contributor

Does this close #129599?

@onur-ozkan
Copy link
Member

Yes it does, thanks for reminding.

@onur-ozkan onur-ozkan mentioned this pull request Oct 7, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@onur-ozkan onur-ozkan

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.83.0
Development

Successfully merging this pull request may close these issues.
6 participants
@shrirambalaji @rustbot @onur-ozkan @bors @ismailarilik @albertlarsan68