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

Use Enabled{Lang,Lib}Feature instead of n-tuples #132114

Merged
merged 1 commit into from
Oct 26, 2024
Merged

Use Enabled{Lang,Lib}Feature instead of n-tuples #132114

merged 1 commit into from
Oct 26, 2024

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Oct 24, 2024 •
edited
Loading

Instead of passing around e.g. (gate_name, attr_span, stable_since) 3-tuples for enabled lang features or (gate_name, attr_span) 2-tuples for enabled lib features, use Enabled{Lang,Lib}Feature structs with named fields.

Also did some minor code-golfing of involved iterator chains to hopefully make them easier to follow.

Follow-up to #132098 (comment) cc @RalfJung.

@rustbot
Copy link
Collaborator

rustbot commented Oct 24, 2024

r? @fee1-dead

rustbot has assigned @fee1-dead.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 24, 2024
@jieyouxu jieyouxu 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 Oct 24, 2024
@jieyouxu
Copy link
Member Author

UI tests passed locally so @rustbot ready

@rustbot rustbot 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 Oct 24, 2024
@jieyouxu jieyouxu 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 Oct 24, 2024
@jieyouxu
Introduce Enabled{Lang,Lib}Feature
3528149 
Instead of passing around random n-tuples of e.g. `(gate_name, attr_sp,
since)`.
@jieyouxu jieyouxu changed the title Use EnabledLangFeature, EnabledLibFeature and LangFeatureStability instead of n-tuples/Option<Symbol> Use Enabled{Lang,Lib}Feature instead of n-tuples Oct 25, 2024
@jieyouxu
Copy link
Member Author

@rustbot ready

@rustbot rustbot 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 Oct 25, 2024
fee1-dead
fee1-dead approved these changes Oct 26, 2024
View reviewed changes
Copy link
Member

@fee1-dead fee1-dead left a comment

Choose a reason for hiding this comment

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

LGTM

@fee1-dead
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 26, 2024

📌 Commit 3528149 has been approved by fee1-dead

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 26, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 26, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 26, 2024
@bors
Auto merge of rust-lang#132171 - matthiaskrgr:rollup-tp75ge7, r=matth…
80d0d92 
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#132114 (Use `Enabled{Lang,Lib}Feature`  instead of n-tuples)
 - rust-lang#132163 (Update Fuchsia CI script for package serving)
 - rust-lang#132168 (Effects cleanup)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8207d89 into rust-lang:master Oct 26, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 26, 2024
@rust-timer
Unrolled build for rust-lang#132114
7cad740 
Rollup merge of rust-lang#132114 - jieyouxu:features-bundle, r=fee1-dead

Use `Enabled{Lang,Lib}Feature`  instead of n-tuples

Instead of passing around e.g. `(gate_name, attr_span, stable_since)` 3-tuples for enabled lang features or `(gate_name, attr_span)` 2-tuples for enabled lib features, use `Enabled{Lang,Lib}Feature` structs with named fields.

Also did some minor code-golfing of involved iterator chains to hopefully make them easier to follow.

Follow-up to rust-lang#132098 (comment) cc `@RalfJung.`
@jieyouxu jieyouxu deleted the features-bundle branch October 26, 2024 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

@fee1-dead fee1-dead fee1-dead approved these changes

Assignees

@fee1-dead fee1-dead

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jieyouxu @rustbot @fee1-dead @bors @RalfJung