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.

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

mark deprecated option as deprecated in rustc_session to remove copypasta and small refactor #135126

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jan 5, 2025

This marks deprecated options as deprecated via flag in options table in rustc_session, which removes copypasted deprecation text from rustc_driver_impl.

This also adds warning for deprecated -C ar option, which didn't emitted any warnings before.
Makes inline_threshold [UNTRACKED], as it do nothing.
Adds few tests.

See individual commits.

@rustbot
Copy link
Collaborator

rustbot commented Jan 5, 2025

r? @cjgillot

rustbot has assigned @cjgillot.
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 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 Jan 5, 2025
@@ -1128,10 +1128,6 @@ pub fn describe_flag_categories(early_dcx: &EarlyDiagCtxt, matches: &Matches) ->
early_dcx.early_warn("the `-Cno-stack-check` flag is deprecated and does nothing");
}

if cg_flags.iter().any(|x| x.starts_with("inline-threshold")) {
Copy link
Contributor Author

@klensy klensy Jan 5, 2025

Choose a reason for hiding this comment

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

Previously this have ability to warn for any possible flags with inline-threshold prefix, but not now.

@rust-log-analyzer

This comment has been minimized.

@klensy klensy force-pushed the deprecated-and-do-nothing branch from 38b67bb to 43f73c0 Compare January 5, 2025 17:51
@rust-log-analyzer

This comment has been minimized.

@klensy klensy force-pushed the deprecated-and-do-nothing branch from 43f73c0 to 080174e Compare January 5, 2025 18:30
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, just one test nit

@jieyouxu jieyouxu assigned jieyouxu and unassigned cjgillot Jan 6, 2025
@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 Jan 6, 2025
@klensy klensy force-pushed the deprecated-and-do-nothing branch from 069d2a2 to da80a6b Compare January 6, 2025 12:22
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks. Can you squash the commits into one? You can r=me after PR CI is green afterwards.

@jieyouxu
Copy link
Member

jieyouxu commented Jan 6, 2025

@bors delegate+ rollup

@bors
Copy link
Contributor

bors commented Jan 6, 2025

✌️ @klensy, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

inline_threshold mark deprecated

no-stack-check

print deprecation message for -Car too

inline_threshold deprecated and do nothing: make in untracked

make OptionDesc struct from tuple
@klensy klensy force-pushed the deprecated-and-do-nothing branch from da80a6b to 37f2631 Compare January 6, 2025 12:38
@klensy
Copy link
Contributor Author

klensy commented Jan 6, 2025

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jan 6, 2025

📌 Commit 37f2631 has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 6, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Jan 7, 2025
…r=jieyouxu

mark deprecated option as deprecated in rustc_session to remove copypasta and small refactor

This marks deprecated options as deprecated via flag in options table in rustc_session, which removes copypasted deprecation text from rustc_driver_impl.

This also adds warning for deprecated `-C ar` option, which didn't emitted any warnings before.
Makes `inline_threshold` `[UNTRACKED]`, as it do nothing.
Adds few tests.

See individual commits.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 7, 2025
Rollup of 9 pull requests

Successful merges:

 - rust-lang#131830 (Add support for wasm exception handling to Emscripten target)
 - rust-lang#132345 (Improve diagnostics for `HostEffectPredicate` in the new solver)
 - rust-lang#134568 (Release notes for 1.84.0)
 - rust-lang#134744 (Don't ice on bad transmute in typeck in new solver)
 - rust-lang#135090 (Suggest to replace tuple constructor through projection)
 - rust-lang#135116 (rustdoc: Fix mismatched capitalization in sidebar)
 - rust-lang#135126 (mark deprecated option as deprecated in rustc_session to remove copypasta and small refactor)
 - rust-lang#135139 ([generic_assert] Constify methods used by the formatting system)
 - rust-lang#135170 (Update triagebot.toml: celinval vacation is over)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 44808ae into rust-lang:master Jan 7, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 7, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 7, 2025
Rollup merge of rust-lang#135126 - klensy:deprecated-and-do-nothing, r=jieyouxu

mark deprecated option as deprecated in rustc_session to remove copypasta and small refactor

This marks deprecated options as deprecated via flag in options table in rustc_session, which removes copypasted deprecation text from rustc_driver_impl.

This also adds warning for deprecated `-C ar` option, which didn't emitted any warnings before.
Makes `inline_threshold` `[UNTRACKED]`, as it do nothing.
Adds few tests.

See individual commits.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

6 participants