Skip to content

Commit

Permalink
Make --print KIND=PATH unstable
Browse files Browse the repository at this point in the history
#113780 should have gone through
an MCP+FCP but wasn't, but instead of reverting the original PR, this PR
just make that new option unstable.
  • Loading branch information
Urgau committed Jul 27, 2023
1 parent 23405bb commit 9268a8b
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 8 deletions.
6 changes: 6 additions & 0 deletions compiler/rustc_session/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2151,6 +2151,12 @@ fn collect_print_requests(
prints.extend(matches.opt_strs("print").into_iter().map(|req| {
let (req, out) = split_out_file_name(&req);

if out.is_some() && !unstable_opts.unstable_options {
handler.early_error(
"the `-Z unstable-options` flag must also be passed to \
enable the path print option",
);
}
let kind = match PRINT_KINDS.iter().find(|&&(name, _)| name == req) {
Some((_, PrintKind::TargetSpec)) => {
if unstable_opts.unstable_options {
Expand Down
4 changes: 0 additions & 4 deletions src/doc/rustc/src/command-line-arguments.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ The valid types of print values are:
This returns rustc's minimum supported deployment target if no `*_DEPLOYMENT_TARGET` variable
is present in the environment, or otherwise returns the variable's parsed value.

A filepath may optionally be specified for each requested information kind, in
the format `--print KIND=PATH`, just like for `--emit`. When a path is
specified, information will be written there instead of to stdout.

[conditional compilation]: ../reference/conditional-compilation.html
[deployment target]: https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html

Expand Down
11 changes: 11 additions & 0 deletions src/doc/unstable-book/src/compiler-flags/path-options.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# `--print` Options

The behavior of the `--print` flag can be modified by optionally be specifiying a filepath
for each requested information kind, in the format `--print KIND=PATH`, just like for
`--emit`. When a path is specified, information will be written there instead of to stdout.

This is unstable feature, so you have to provide `-Zunstable-options` to enable it.

## Examples

`rustc main.rs -Z unstable-options --print cfg=cfgs.txt`
8 changes: 4 additions & 4 deletions tests/run-make/print-cfg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ all: default output_to_file

output_to_file:
# Backend-independent, printed by rustc_driver_impl/src/lib.rs
$(RUSTC) --target x86_64-pc-windows-gnu --print cfg=$(TMPDIR)/cfg.txt
$(RUSTC) --target x86_64-pc-windows-gnu --print cfg=$(TMPDIR)/cfg.txt -Z unstable-options
$(CGREP) windows < $(TMPDIR)/cfg.txt

# Printed from CodegenBackend trait impl in rustc_codegen_llvm/src/lib.rs
$(RUSTC) --print relocation-models=$(TMPDIR)/relocation-models.txt
$(RUSTC) --print relocation-models=$(TMPDIR)/relocation-models.txt -Z unstable-options
$(CGREP) dynamic-no-pic < $(TMPDIR)/relocation-models.txt

# Printed by compiler/rustc_codegen_llvm/src/llvm_util.rs
$(RUSTC) --target wasm32-unknown-unknown --print target-features=$(TMPDIR)/target-features.txt
$(RUSTC) --target wasm32-unknown-unknown --print target-features=$(TMPDIR)/target-features.txt -Z unstable-options
$(CGREP) reference-types < $(TMPDIR)/target-features.txt

# Printed by C++ code in rustc_llvm/llvm-wrapper/PassWrapper.cpp
$(RUSTC) --target wasm32-unknown-unknown --print target-cpus=$(TMPDIR)/target-cpus.txt
$(RUSTC) --target wasm32-unknown-unknown --print target-cpus=$(TMPDIR)/target-cpus.txt -Z unstable-options
$(CGREP) generic < $(TMPDIR)/target-cpus.txt

ifdef IS_WINDOWS
Expand Down
2 changes: 2 additions & 0 deletions tests/ui/feature-gates/print-with-path.cfg.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
error: the `-Z unstable-options` flag must also be passed to enable the path print option

7 changes: 7 additions & 0 deletions tests/ui/feature-gates/print-with-path.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// check-fail
// revisions: cfg target-features target-cpus
// [cfg]compile-flags: --print cfg=cfg.txt
// [target-cpus]compile-flags: --print target-cpu=target_cpu.txt
// [target-features]compile-flags: --print target-features=target_features.txt

fn main() {}
2 changes: 2 additions & 0 deletions tests/ui/feature-gates/print-with-path.target-cpus.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
error: the `-Z unstable-options` flag must also be passed to enable the path print option

2 changes: 2 additions & 0 deletions tests/ui/feature-gates/print-with-path.target-features.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
error: the `-Z unstable-options` flag must also be passed to enable the path print option

0 comments on commit 9268a8b

Please sign in to comment.