Remove `rustc_session::config::rustc_short_optgroups` by Zalathar · Pull Request #132891 · rust-lang/rust

Zalathar · 2024-11-11T05:47:59Z

The name rustc_short_optgroups has always been confusing, because it is unrelated to the distinction between short and long options (i.e. -s vs --long), and instead means something like “the subset of command-line options that are printed by rustc --help without -v”.

So let's merge that function into the main rustc_optgroups, and store the relevant bit of information in a boolean field in RustcOptGroup instead.

This PR also modifies RustcOptGroup to store its various strings directly, instead of inside a boxed apply closure. That turned out to not be necessary for the main change, but is a worthwhile cleanup in its own right.

rustbot · 2024-11-11T05:48:08Z

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
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

compiler/rustc_session/src/config.rs

jieyouxu · 2024-11-11T09:24:46Z

r? jieyouxu

jieyouxu

Very nice cleanup! One minor naming nit then r=me.

jieyouxu · 2024-11-11T09:43:21Z

compiler/rustc_session/src/config.rs

+    /// Display name for this option. Normally equal to `long_name`, except for
+    /// options that don't have a long name.
    pub name: &'static str,


Suggestion: display_name? We have short_name and long_name below, so having just name feels a bit confusing.

So, in the process of looking into this, I remembered that things are actually more complicated.

We do use this as a display name, but it also gets used for other things, such as matching against the option name reported by some getopts errors.

So I'm going to push a better comment, but now I don't like the idea of trying to rename name in this PR.

Yes, that's fine with me.

jieyouxu · 2024-11-11T09:46:35Z

compiler/rustc_session/src/config.rs

+    /// If true, this option should not be printed by `rustc --help`, but
+    /// should still be printed by `rustc --help -v`.
+    pub is_verbose_help_only: bool,


Remark: yes thank you, this is so much clearer.

compiler/rustc_session/src/config.rs

jieyouxu · 2024-11-11T09:48:11Z

@rustbot author

Zalathar · 2024-11-11T11:52:41Z

Revised comment for name (diff), in light of the fact that it's not just a display name.

@rustbot ready

jieyouxu

Cool

jieyouxu · 2024-11-11T12:59:03Z

@bors r+ rollup

bors · 2024-11-11T12:59:06Z

📌 Commit 8b4701d has been approved by jieyouxu

It is now in the queue for this repository.

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#129627 (Ensure that tail expr receive lifetime extension) - rust-lang#130999 (Implement file_lock feature) - rust-lang#132873 (handle separate prefixes in clippy rules) - rust-lang#132891 (Remove `rustc_session::config::rustc_short_optgroups`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#132891 - Zalathar:short-opt-groups, r=jieyouxu Remove `rustc_session::config::rustc_short_optgroups` Follow-up to rust-lang#132754 (comment). The name `rustc_short_optgroups` has always been confusing, because it is unrelated to the distinction between short and long options (i.e. `-s` vs `--long`), and instead means something like “the subset of command-line options that are printed by `rustc --help` without `-v`”. So let's merge that function into the main `rustc_optgroups`, and store the relevant bit of information in a boolean field in `RustcOptGroup` instead. --- This PR also modifies `RustcOptGroup` to store its various strings directly, instead of inside a boxed `apply` closure. That turned out to not be necessary for the main change, but is a worthwhile cleanup in its own right.

Remove `rustc_session::config::rustc_short_optgroups` Follow-up to rust-lang#132754 (comment). The name `rustc_short_optgroups` has always been confusing, because it is unrelated to the distinction between short and long options (i.e. `-s` vs `--long`), and instead means something like “the subset of command-line options that are printed by `rustc --help` without `-v`”. So let's merge that function into the main `rustc_optgroups`, and store the relevant bit of information in a boolean field in `RustcOptGroup` instead. --- This PR also modifies `RustcOptGroup` to store its various strings directly, instead of inside a boxed `apply` closure. That turned out to not be necessary for the main change, but is a worthwhile cleanup in its own right.

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#129627 (Ensure that tail expr receive lifetime extension) - rust-lang#130999 (Implement file_lock feature) - rust-lang#132873 (handle separate prefixes in clippy rules) - rust-lang#132891 (Remove `rustc_session::config::rustc_short_optgroups`) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned BoxyUwU Nov 11, 2024

rustbot added 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 Nov 11, 2024

Zalathar commented Nov 11, 2024

View reviewed changes

compiler/rustc_session/src/config.rs Show resolved Hide resolved

rustbot assigned jieyouxu and unassigned BoxyUwU Nov 11, 2024

jieyouxu approved these changes Nov 11, 2024

View reviewed changes

rustbot 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 Nov 11, 2024

Zalathar added 2 commits November 11, 2024 22:46

Store option strings directly, not in a boxed apply closure

3250c1c

Remove rustc_session::config::rustc_short_optgroups

8b4701d

Zalathar force-pushed the short-opt-groups branch from e4d6ff5 to 8b4701d Compare November 11, 2024 11:51

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 Nov 11, 2024

jieyouxu approved these changes Nov 11, 2024

View reviewed changes

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 Nov 11, 2024

matthiaskrgr mentioned this pull request Nov 11, 2024

Rollup of 4 pull requests #132902

Merged

bors merged commit bcd85e5 into rust-lang:master Nov 11, 2024

rustbot added this to the 1.84.0 milestone Nov 11, 2024

Zalathar deleted the short-opt-groups branch November 11, 2024 23:47

Uh oh!

Conversation

Zalathar commented Nov 11, 2024

Uh oh!

rustbot commented Nov 11, 2024

Uh oh!

Uh oh!

jieyouxu commented Nov 11, 2024

Uh oh!

jieyouxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

Zalathar Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

jieyouxu Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

jieyouxu Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jieyouxu commented Nov 11, 2024

Uh oh!

Zalathar commented Nov 11, 2024

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Nov 11, 2024

Uh oh!

bors commented Nov 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jieyouxu left a comment •

edited

Loading