Rename `debugging_opts` to `unstable_opts` #98975

jyn514 · 2022-07-06T13:02:29Z

This is no longer used only for debugging options (e.g. -Zoutput-width, -Zallow-features).
Rename it to be more clear.

cc https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Codegen.20options.20.2F.20debugging.20options

r? @Amanieu cc @nikic @joshtriplett

rustbot · 2022-07-06T13:02:32Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

jyn514

left comments on the changes which aren't a blanket "debugging_opts" => "unstable_opts" change

jyn514 · 2022-07-06T13:03:56Z

src/librustdoc/lib.rs

@@ -366,7 +366,7 @@ fn opts() -> Vec<RustcOptGroup> {
            )
        }),
        unstable("Z", |o| {
-            o.optmulti("Z", "", "internal and debugging options (only on nightly build)", "FLAG")
+            o.optmulti("Z", "", "unstable / perma-unstable options (only on nightly build)", "FLAG")


this should probably have a rustdoc reviewer - @camelid does this new description look good?

jyn514 · 2022-07-06T13:04:54Z

compiler/rustc_session/src/config.rs

@@ -1652,12 +1652,12 @@ pub fn parse_crate_edition(matches: &getopts::Matches) -> Edition {
    edition
 }

-fn check_debug_option_stability(
-    debugging_opts: &DebuggingOptions,
+fn check_error_format_stability(


this change wasn't automatic

Thanks for pointing these out!

jyn514 · 2022-07-06T13:05:37Z

compiler/rustc_session/src/options.rs

@@ -1186,12 +1186,13 @@ options! {
 }

 options! {
-    DebuggingOptions, DB_OPTIONS, dbopts, "Z", "debugging",
+    UnstableOptions, Z_OPTIONS, dbopts, "Z", "unstable",


this change wasn't automatic - I think "unstable" is a good new description, and Z_OPTIONS isn't super descriptive, but neither was DB_OPTIONS.

jyn514 · 2022-07-06T13:05:57Z

compiler/rustc_session/src/options.rs


    // This list is in alphabetical order.
    //
    // If you add a new option, please update:
    // - compiler/rustc_interface/src/tests.rs
+    // - src/doc/unstable-book/src/compiler-flags


not related to this PR, but seems like a good change. happy to split it into a separate PR.

jyn514 · 2022-07-06T13:06:17Z

compiler/rustc_session/src/options.rs

+    /// This name is kind of confusing: Most unstable options enable something themselves, while
+    /// this just allows "normal" options to be feature-gated.
    unstable_options: bool = (false, parse_bool, [UNTRACKED],


note the new way to use this is unstable_opts.unstable_options

jyn514 · 2022-07-06T13:41:16Z

This description doesn't seem to be used anywhere? IMO we should probably just remove all these if they're not used.
https://github.com/rust-lang/rust/blob/06b32351046d062a063628d759f7ce1611561c24/compiler/rustc_session/src/config.rs#L1413

~~Oh never mind, it seems to be used in our man pages. (I didn't know we had man pages?)~~ nope, the man pages are manually edited, not autogenerated. We should probably find a way to autogenerate them if we want them to be accurate ...

wesleywiser · 2022-07-06T14:58:41Z

This description doesn't seem to be used anywhere? IMO we should probably just remove all these if they're not used.

https://github.com/rust-lang/rust/blob/06b32351046d062a063628d759f7ce1611561c24/compiler/rustc_session/src/config.rs#L1413

~~Oh never mind, it seems to be used in our man pages. (I didn't know we had man pages?)~~ nope, the man pages are manually edited, not autogenerated. We should probably find a way to autogenerate them if we want them to be accurate ...

Can we go ahead and update that just for consistency?

wesleywiser

Thanks for doing this @jyn514! I reviewed all of the changes and overall this looks great to me. I'm going to hold off on the r+ for a few days so others can weigh in.

compiler/rustc_span/src/lib.rs

src/librustdoc/config.rs

wesleywiser · 2022-07-06T14:52:25Z

compiler/rustc_session/src/config.rs

@@ -1652,12 +1652,12 @@ pub fn parse_crate_edition(matches: &getopts::Matches) -> Edition {
    edition
 }

-fn check_debug_option_stability(
-    debugging_opts: &DebuggingOptions,
+fn check_error_format_stability(


Thanks for pointing these out!

compiler/rustc_session/src/config.rs

bors · 2022-07-07T18:24:25Z

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

jyn514 · 2022-07-10T21:18:23Z

@wesleywiser it's been a few days, including weekdays and a weekend - do you think it's ok to merge now? This bitrots quite quickly.

wesleywiser · 2022-07-11T13:39:51Z

Yes, please r=me after a rebase. Thanks for doing this!

jyn514 · 2022-07-11T15:06:51Z

@bors r=wesleywiser rollup=never

bors · 2022-07-11T15:06:53Z

📌 Commit dde82482724c206cbdb2dd7ccd604182912e2921 has been approved by wesleywiser

It is now in the queue for this repository.

bors · 2022-07-12T03:53:07Z

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

This is no longer used only for debugging options (e.g. `-Zoutput-width`, `-Zallow-features`). Rename it to be more clear.

jyn514 · 2022-07-13T22:47:38Z

@bors r=wesleywiser rollup=never

bors · 2022-07-13T22:47:40Z

📌 Commit 3c9765c has been approved by wesleywiser

It is now in the queue for this repository.

bors · 2022-07-14T08:14:34Z

⌛ Testing commit 3c9765c with merge 0ed9c64...

bors · 2022-07-14T11:00:18Z

☀️ Test successful - checks-actions
Approved by: wesleywiser
Pushing 0ed9c64 to master...

rust-highfive · 2022-07-14T11:00:42Z

📣 Toolstate changed by #98975!

Tested on commit 0ed9c64.
Direct link to PR: #98975

💔 miri on windows: test-fail → build-fail (cc @RalfJung @oli-obk).
💔 miri on linux: test-fail → build-fail (cc @RalfJung @oli-obk).
💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).

@RalfJung

Tested on commit rust-lang/rust@0ed9c64. Direct link to PR: <rust-lang/rust#98975> 💔 miri on windows: test-fail → build-fail (cc @RalfJung @oli-obk). 💔 miri on linux: test-fail → build-fail (cc @RalfJung @oli-obk). 💔 rls on windows: test-pass → build-fail (cc @Xanewok). 💔 rls on linux: test-pass → build-fail (cc @Xanewok).

rust-timer · 2022-07-14T12:15:46Z

Finished benchmarking commit (0ed9c64): comparison url.

Instruction count

Primary benchmarks: no relevant changes found
Secondary benchmarks: 🎉 relevant improvement found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-1.1%	-1.1%	1
All 😿🎉 (primary)	N/A	N/A	0

Max RSS (memory usage)

Results

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	2.3%	2.3%	1
Improvements 🎉 (primary)	-1.1%	-1.1%	1
Improvements 🎉 (secondary)	-2.2%	-2.2%	3
All 😿🎉 (primary)	-1.1%	-1.1%	1

Cycles

Results

Primary benchmarks: mixed results
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	2.6%	2.6%	1
Regressions 😿 (secondary)	2.1%	2.1%	1
Improvements 🎉 (primary)	-2.6%	-2.6%	1
Improvements 🎉 (secondary)	-3.7%	-3.7%	1
All 😿🎉 (primary)	0.0%	2.6%	2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

jyn514 · 2022-07-14T12:16:41Z

This only renames some variables, I doubt the improvements are real (seems more likely those benchmarks are high variance)

Rename `debugging_opts` to `unstable_opts` This is no longer used only for debugging options (e.g. `-Zoutput-width`, `-Zallow-features`). Rename it to be more clear. cc https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Codegen.20options.20.2F.20debugging.20options r? `@Amanieu` cc `@nikic` `@joshtriplett`

jyn514 added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 6, 2022

rust-highfive assigned Amanieu Jul 6, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 6, 2022

jyn514 commented Jul 6, 2022

View reviewed changes

jyn514 force-pushed the unstable_opts branch 2 times, most recently from 0567674 to 06b3235 Compare July 6, 2022 13:40

jyn514 mentioned this pull request Jul 6, 2022

Autogenerate man pages #98977

Open

wesleywiser approved these changes Jul 6, 2022

View reviewed changes

jyn514 force-pushed the unstable_opts branch from 06b3235 to 6a8cf2d Compare July 6, 2022 15:17

jyn514 assigned wesleywiser and unassigned Amanieu Jul 10, 2022

jyn514 force-pushed the unstable_opts branch from 6a8cf2d to dde8248 Compare July 11, 2022 14:56

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 Jul 11, 2022

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 12, 2022

Rename debugging_opts to unstable_opts

3c9765c

This is no longer used only for debugging options (e.g. `-Zoutput-width`, `-Zallow-features`). Rename it to be more clear.

jyn514 force-pushed the unstable_opts branch from dde8248 to 3c9765c Compare July 13, 2022 22:47

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 13, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 13, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2022

bors merged commit 0ed9c64 into rust-lang:master Jul 14, 2022

rustbot added this to the 1.64.0 milestone Jul 14, 2022

rust-highfive mentioned this pull request Jul 14, 2022

rls no longer builds after rust-lang/rust#98975 #99234

Closed

jyn514 deleted the unstable_opts branch July 14, 2022 12:15

jyn514 mentioned this pull request Jul 14, 2022

miri no longer builds after rust-lang/rust#97995 #99224

Closed

bjorn3 mentioned this pull request Jul 17, 2022

RFC-2841: add codegen flag export symbols from executable #85673

Merged

celinval mentioned this pull request Jul 21, 2022

Update toolchain to nightly-2022-07-19 model-checking/kani#1399

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename `debugging_opts` to `unstable_opts` #98975

Rename `debugging_opts` to `unstable_opts` #98975

jyn514 commented Jul 6, 2022

rustbot commented Jul 6, 2022

jyn514 left a comment

jyn514 Jul 6, 2022

jyn514 Jul 6, 2022

wesleywiser Jul 6, 2022

jyn514 Jul 6, 2022

jyn514 Jul 6, 2022

jyn514 Jul 6, 2022

jyn514 commented Jul 6, 2022 •

edited

Loading

wesleywiser commented Jul 6, 2022

wesleywiser left a comment

wesleywiser Jul 6, 2022

bors commented Jul 7, 2022

jyn514 commented Jul 10, 2022

wesleywiser commented Jul 11, 2022

jyn514 commented Jul 11, 2022

bors commented Jul 11, 2022

bors commented Jul 12, 2022

jyn514 commented Jul 13, 2022

bors commented Jul 13, 2022

bors commented Jul 14, 2022

bors commented Jul 14, 2022

rust-highfive commented Jul 14, 2022

rust-timer commented Jul 14, 2022

jyn514 commented Jul 14, 2022

Rename debugging_opts to unstable_opts #98975

Rename debugging_opts to unstable_opts #98975

Conversation

jyn514 commented Jul 6, 2022

rustbot commented Jul 6, 2022

jyn514 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jyn514 commented Jul 6, 2022 • edited Loading

wesleywiser commented Jul 6, 2022

wesleywiser left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jul 7, 2022

jyn514 commented Jul 10, 2022

wesleywiser commented Jul 11, 2022

jyn514 commented Jul 11, 2022

bors commented Jul 11, 2022

bors commented Jul 12, 2022

jyn514 commented Jul 13, 2022

bors commented Jul 13, 2022

bors commented Jul 14, 2022

bors commented Jul 14, 2022

rust-highfive commented Jul 14, 2022

rust-timer commented Jul 14, 2022

Footnotes

jyn514 commented Jul 14, 2022

Rename `debugging_opts` to `unstable_opts` #98975

Rename `debugging_opts` to `unstable_opts` #98975

jyn514 commented Jul 6, 2022 •

edited

Loading