Skip to content

Rename debugging_opts to unstable_opts - #98975

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:unstable_opts
Jul 14, 2022
Merged

Rename debugging_opts to unstable_opts#98975
bors merged 1 commit into
rust-lang:masterfrom
jyn514:unstable_opts

Conversation

@jyn514

Copy link
Copy Markdown
Member

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

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

Copy link
Copy Markdown
Collaborator

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

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

@jyn514jyn514 left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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

Comment threadsrc/librustdoc/lib.rs Outdated

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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

Comment threadcompiler/rustc_session/src/config.rs Outdated

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

this change wasn't automatic

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for pointing these out!

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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

Comment on lines 1579 to 1586

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

note the new way to use this is unstable_opts.unstable_options

@jyn514
jyn514force-pushed the unstable_opts branch 2 times, most recently from 0567674 to 06b3235CompareJuly 6, 2022 13:40
@jyn514

jyn514 commented Jul 6, 2022

Copy link
Copy Markdown
MemberAuthor

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

@jyn514jyn514 mentioned this pull request Jul 6, 2022
@wesleywiser

Copy link
Copy Markdown
Member

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?

@wesleywiserwesleywiser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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.

Comment threadcompiler/rustc_span/src/lib.rs Outdated
Comment threadsrc/librustdoc/config.rs Outdated
Comment threadcompiler/rustc_session/src/config.rs Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for pointing these out!

Comment threadcompiler/rustc_session/src/config.rs Outdated
@bors

bors commented Jul 7, 2022

Copy link
Copy Markdown
Collaborator

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

@jyn514

Copy link
Copy Markdown
MemberAuthor

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

@jyn514jyn514 assigned wesleywiser and unassigned AmanieuJul 10, 2022
@wesleywiser

Copy link
Copy Markdown
Member

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

@jyn514

Copy link
Copy Markdown
MemberAuthor

@bors r=wesleywiser rollup=never

@bors

bors commented Jul 11, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit dde82482724c206cbdb2dd7ccd604182912e2921 has been approved by wesleywiser

It is now in the queue for this repository.

@borsbors 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

bors commented Jul 12, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors 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
This is no longer used only for debugging options (e.g. `-Zoutput-width`, `-Zallow-features`).
Rename it to be more clear.
@jyn514

Copy link
Copy Markdown
MemberAuthor

@bors r=wesleywiser rollup=never

@bors

bors commented Jul 13, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 3c9765c has been approved by wesleywiser

It is now in the queue for this repository.

@borsbors 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
@borsbors 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

bors commented Jul 14, 2022

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jul 14, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2022
@bors
bors merged commit 0ed9c64 into rust-lang:masterJul 14, 2022
@rustbotrustbot added this to the 1.64.0 milestone Jul 14, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 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).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 14, 2022
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

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (0ed9c64): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
-1.1%-1.1%1
All 😿🎉 (primary)N/AN/A0

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: mixed results
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
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
mean1maxcount2
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

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

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

Copy link
Copy Markdown
MemberAuthor

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

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 18, 2022
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`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@jyn514@rustbot@wesleywiser@bors@rust-highfive@rust-timer@Amanieu