Hide unstable print kinds within emit_unknown_print_request_help in stable channel #139850

xizheyin · 2025-04-15T07:19:13Z

We need to get the channel from matches. However, since matches(Line 1169) is constructed after rustc_optgroups (Line1165, where RustcOptGroup::value_hint is generated, i.e. what rustc --print print prints), I've left it unchanged here for now.

rust/compiler/rustc_driver_impl/src/lib.rs

Lines 1161 to 1169 in 2da29db

    
           pub fn handle_options(early_dcx: &EarlyDiagCtxt, args: &[String]) -> Option<getopts::Matches> { 
        
               // Parse with *all* options defined in the compiler, we don't worry about 
        
               // option stability here we just want to parse as much as possible. 
        
               let mut options = getopts::Options::new(); 
        
               let optgroups = config::rustc_optgroups(); 
        
               for option in &optgroups { 
        
                   option.apply(&mut options); 
        
               } 
        
               let matches = options.parse(args).unwrap_or_else(|e| {

There is actually a way to manually parse the --crate-name parameter, but I'm afraid that's an unorthodox practice. So I conservatively just modified emit_unknown_print_request_help to print different parameters depending on whether they are nightly or not when passing the error parameter.

r? @jieyouxu

rustbot · 2025-04-15T07:19:18Z

r? @petrochenkov

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

jieyouxu

Can you add a functional test for this change? In the test, I'd also like to see exercised:

Single stable print flag vs single unstable print flag
Mixed unstable/stable print flag

xizheyin · 2025-04-15T08:16:45Z

Sure no problem, but I would like to know how to add functional tests, is it done locally to me?

jieyouxu · 2025-04-15T08:28:37Z

As in, a ui test

e.g. https://rustc-dev-guide.rust-lang.org/tests/adding.html

xizheyin · 2025-04-15T12:40:45Z

Ooh, I have no idea to control the channel, e.g. nightly or stable, in the ui test. It may be like

//@ compile-flags: --print zzz
//@ exec-env:CFG_CHANNEL=stable

//~? ERROR unknown print request: `zzz`

or

//@ exec-env:CFG_RELEASE_CHANNEL=stable

or

//@ exec-env:CFG_DISABLE_UNSTABLE_FEATURES=1

But they are failed. Do you have any suggestion?

jieyouxu · 2025-04-15T12:47:22Z

What you can do for the purpose of this test (RUSTC_BOOTSTRAP=1 will permit unstable features, which as a corollary should cause the nightly gating you have to be active)

//@ revisions: force_stable force_unstable
//@[force_stable] rustc-env: RUSTC_BOOTSTRAP=-1
//@[force_unstable] rustc-env: RUSTC_BOOTSTRAP=1

xizheyin · 2025-04-16T04:14:04Z

It works, but it passes unstable flags -Z to the rustc,

command: env -u RUSTC_LOG_COLOR RUSTC_BOOTSTRAP="-1" RUSTC_ICE="0" RUST_BACKTRACE="short" "/home/nju/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/home/nju/rust/tests/ui/print-request/hide-unstable-in-stable-issue-138698.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/home/nju/.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/home/nju/rust/vendor" "--sysroot" "/home/nju/rust/build/x86_64-unknown-linux-gnu/stage1" "--target=x86_64-unknown-linux-gnu" "--cfg" "force_stable" "--check-cfg" "cfg(test,FALSE,force_stable,force_unstable)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/home/nju/rust/build/x86_64-unknown-linux-gnu/test/ui/print-request/hide-unstable-in-stable-issue-138698.force_stable" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/home/nju/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--print" "xxx"

and report

error: the option `Z` is only accepted on the nightly compiler

help: consider switching to a nightly toolchain: `rustup default nightly`

note: selecting a toolchain with `+toolchain` arguments require a rustup proxy; see <https://rust-lang.github.io/rustup/concepts/index.html>

note: for more information about Rust's stability policy, see <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html#unstable-features>

error: 1 nightly option were parsed

How to turn off the flags?

By the way, would it be better to write it to rustc_develop_guide, I didn't find this in the documentation.

jieyouxu · 2025-04-16T04:19:01Z

Oh right I forgor about the ui test preset flags. In this case, can you use a run-make test instead, since you want to explicitly control and constrain the exact compiler flags you want to pass.

jieyouxu · 2025-04-16T04:20:23Z

By the way, would it be better to write it to rustc_develop_guide, I didn't find this in the documentation.

https://rustc-dev-guide.rust-lang.org/tests/misc.html

rustbot · 2025-04-16T08:58:16Z

This PR modifies run-make tests.

cc @jieyouxu

xizheyin · 2025-04-16T09:00:23Z

I've added a run-make test for current PR, and a few more that may help later with changes to the relevant topic. So I named it print-in-stable-or-unstable-channel.

jieyouxu

Thanks, some more nits

compiler/rustc_session/src/config.rs

tests/run-make/print-in-stable-or-unstable-channel/rmake.rs

jieyouxu · 2025-04-16T14:18:34Z

I've added a run-make test for current PR, and a few more that may help later with changes to the relevant topic. So I named it print-in-stable-or-unstable-channel.

Can you call it sth like "print-request-help-stable-unstable" instead (see the review comments above regarding redundant tests)?

xizheyin · 2025-04-16T15:39:32Z

Thank you, I revised it. : ) @jieyouxu

jieyouxu

Looks good for the most part, some suggestions

tests/run-make/print-request-help-stable-unstable/Cargo.toml

tests/run-make/print-request-help-stable-unstable/rmake.rs

xizheyin · 2025-04-16T16:38:51Z

I updated it. 😊

jieyouxu · 2025-04-17T13:29:14Z

BTW you can mark PR as ready for review with @rustbot review, otherwise I might not look at S-waiting-on-author PRs in my review queue.

jieyouxu

Thanks, can you squash the commits into one?

…table channel Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

xizheyin · 2025-04-17T14:04:31Z

Ok, so that's how you review.

@rustbot review

jieyouxu · 2025-04-17T14:25:10Z

Ah yeah, triagebot would print that help message about @rustbot ready (review is an alias for ready) now if I explicitly write:

@rustbot author

rustbot · 2025-04-17T14:25:15Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

jieyouxu

Thanks

jieyouxu · 2025-04-17T14:26:12Z

@bors r+ rollup

bors · 2025-04-17T14:26:14Z

📌 Commit 8562110 has been approved by jieyouxu

It is now in the queue for this repository.

Hide unstable print kinds within emit_unknown_print_request_help in stable channel Fixes rust-lang#138698 We need to get the channel from `matches`. However, since `matches`(Line 1169) is constructed after `rustc_optgroups` (Line1165, where `RustcOptGroup::value_hint` is generated, i.e. what `rustc --print print` prints), I've left it unchanged here for now. https://github.com/rust-lang/rust/blob/2da29dbe8fe23df1c7c4ab1d8740ca3c32b15526/compiler/rustc_driver_impl/src/lib.rs#L1161-L1169 There is actually a way to manually parse the `--crate-name` parameter, but I'm afraid that's an unorthodox practice. So I conservatively just modified `emit_unknown_print_request_help` to print different parameters depending on whether they are nightly or not when passing the error parameter. r? `@jieyouxu`

Hide unstable print kinds within emit_unknown_print_request_help in stable channel Fixes rust-lang#138698 We need to get the channel from `matches`. However, since `matches`(Line 1169) is constructed after `rustc_optgroups` (Line1165, where `RustcOptGroup::value_hint` is generated, i.e. what `rustc --print print` prints), I've left it unchanged here for now. https://github.com/rust-lang/rust/blob/2da29dbe8fe23df1c7c4ab1d8740ca3c32b15526/compiler/rustc_driver_impl/src/lib.rs#L1161-L1169 There is actually a way to manually parse the `--crate-name` parameter, but I'm afraid that's an unorthodox practice. So I conservatively just modified `emit_unknown_print_request_help` to print different parameters depending on whether they are nightly or not when passing the error parameter. r? ``@jieyouxu``

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#139774 (Fix replacing supertrait aliases in `ReplaceProjectionWith`) - rust-lang#139850 (Hide unstable print kinds within emit_unknown_print_request_help in stable channel) - rust-lang#139870 (add retries to remove and create dir all) - rust-lang#139902 (do not emit `OpaqueCast` projections with `-Znext-solver`) - rust-lang#139931 (bootstrap: enable zlib for LLVM for Windows GNU) - rust-lang#139935 (Upgrade to `rustc-rayon-core` 0.5.1) - rust-lang#139943 (rustdoc: Support inlined cross-crate re-exported trait aliases) - rust-lang#139961 (Two `rustc_const_eval` cleanups) - rust-lang#139962 (opt-dist: add a flag for running tests) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139850 - xizheyin:issue-138698, r=jieyouxu Hide unstable print kinds within emit_unknown_print_request_help in stable channel Fixes rust-lang#138698 We need to get the channel from `matches`. However, since `matches`(Line 1169) is constructed after `rustc_optgroups` (Line1165, where `RustcOptGroup::value_hint` is generated, i.e. what `rustc --print print` prints), I've left it unchanged here for now. https://github.com/rust-lang/rust/blob/2da29dbe8fe23df1c7c4ab1d8740ca3c32b15526/compiler/rustc_driver_impl/src/lib.rs#L1161-L1169 There is actually a way to manually parse the `--crate-name` parameter, but I'm afraid that's an unorthodox practice. So I conservatively just modified `emit_unknown_print_request_help` to print different parameters depending on whether they are nightly or not when passing the error parameter. r? ```@jieyouxu```

rustbot assigned petrochenkov Apr 15, 2025

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 Apr 15, 2025

rustbot assigned jieyouxu and unassigned petrochenkov Apr 15, 2025

jieyouxu requested changes Apr 15, 2025

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 Apr 15, 2025

rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Apr 16, 2025

jieyouxu requested changes Apr 16, 2025

View reviewed changes

xizheyin force-pushed the issue-138698 branch from 2ab6807 to 0c9a1cd Compare April 16, 2025 15:38

jieyouxu reviewed Apr 16, 2025

View reviewed changes

xizheyin force-pushed the issue-138698 branch from 0c9a1cd to f02dd16 Compare April 16, 2025 16:37

jieyouxu approved these changes Apr 17, 2025

View reviewed changes

Hide unstable print kinds within emit_unknown_print_request_help in s…

8562110

…table channel Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

xizheyin force-pushed the issue-138698 branch from f02dd16 to 8562110 Compare April 17, 2025 14:03

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 Apr 17, 2025

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 Apr 17, 2025

jieyouxu approved these changes Apr 17, 2025

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 17, 2025

matthiaskrgr mentioned this pull request Apr 17, 2025

Rollup of 10 pull requests #139973

Closed

This was referenced Apr 17, 2025

Rollup of 9 pull requests #139975

Closed

Rollup of 9 pull requests #139979

Merged

bors merged commit d2db1c1 into rust-lang:master Apr 17, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone Apr 17, 2025

xizheyin deleted the issue-138698 branch April 22, 2025 04:10

	pub fn handle_options(early_dcx: &EarlyDiagCtxt, args: &[String]) -> Option<getopts::Matches> {
	// Parse with all options defined in the compiler, we don't worry about
	// option stability here we just want to parse as much as possible.
	let mut options = getopts::Options::new();
	let optgroups = config::rustc_optgroups();
	for option in &optgroups {
	option.apply(&mut options);
	}
	let matches = options.parse(args).unwrap_or_else(\|e\| {

Hide unstable print kinds within emit_unknown_print_request_help in stable channel #139850

Hide unstable print kinds within emit_unknown_print_request_help in stable channel #139850

Uh oh!

Conversation

xizheyin commented Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 15, 2025

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!

xizheyin commented Apr 15, 2025

Uh oh!

jieyouxu commented Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xizheyin commented Apr 15, 2025

Uh oh!

jieyouxu commented Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xizheyin commented Apr 16, 2025

Uh oh!

jieyouxu commented Apr 16, 2025

Uh oh!

jieyouxu commented Apr 16, 2025

Uh oh!

rustbot commented Apr 16, 2025

Uh oh!

xizheyin commented Apr 16, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Apr 16, 2025

Uh oh!

xizheyin commented Apr 16, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xizheyin commented Apr 16, 2025

Uh oh!

jieyouxu commented Apr 17, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

xizheyin commented Apr 17, 2025

Uh oh!

jieyouxu commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 17, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Apr 17, 2025

Uh oh!

bors commented Apr 17, 2025

Uh oh!

Uh oh!

Uh oh!

xizheyin commented Apr 15, 2025 •

edited

Loading

jieyouxu left a comment •

edited

Loading

jieyouxu commented Apr 15, 2025 •

edited

Loading

jieyouxu commented Apr 15, 2025 •

edited

Loading

jieyouxu commented Apr 17, 2025 •

edited

Loading