bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #140077 - xizheyin:issue-139805, r=jieyouxu

Browse source 
Construct OutputType using macro and print [=FILENAME] help info

Closes #139805

Use define_output_types to define variants of OutputType, as well as refactor all of its methods for clarity. This way no variant is missed when pattern matching or output help messages.

On top of that, I optimized for `emit` help messages.

r? ```@jieyouxu```
This commit is contained in:
Chris Denton 2025-04-22 01:22:12 +00:00 • committed by GitHub
commit 2fff8257ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 247 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/run-make/metadata-dep-info/dash-separated_something-extra.expected.d
View file

@ -1,5 +1,5 @@
libdash_separated_something-extra.rmeta: dash-separated.rs
dash-separated_something-extra.d: dash-separated.rs
libdash_separated_something-extra.rmeta: dash-separated.rs
dash-separated.rs:

2
tests/run-make/rustc-help/help-v.diff
View file

@ -1,4 +1,4 @@
@@ -53,10 +53,27 @@
@@ -63,10 +63,27 @@
Set a codegen option
-V, --version Print version info and exit
-v, --verbose Use verbose output

14
tests/run-make/rustc-help/help-v.stdout
View file

@ -26,9 +26,19 @@ Options:
Specify which edition of the compiler to use when
compiling code. The default is 2015 and the latest
stable edition is 2024.
--emit [asm|llvm-bc|llvm-ir|obj|metadata|link|dep-info|mir]
--emit TYPE[=FILE]
Comma separated list of types of output for the
compiler to emit
compiler to emit.
Each TYPE has the default FILE name:
* asm - CRATE_NAME.s
* llvm-bc - CRATE_NAME.bc
* dep-info - CRATE_NAME.d
* link - (platform and crate-type dependent)
* llvm-ir - CRATE_NAME.ll
* metadata - libCRATE_NAME.rmeta
* mir - CRATE_NAME.mir
* obj - CRATE_NAME.o
* thin-link-bitcode - CRATE_NAME.indexing.o
--print INFO[=FILE]
Compiler information to print on stdout (or to a file)
INFO may be one of

14
tests/run-make/rustc-help/help.stdout
View file

@ -26,9 +26,19 @@ Options:
Specify which edition of the compiler to use when
compiling code. The default is 2015 and the latest
stable edition is 2024.
--emit [asm|llvm-bc|llvm-ir|obj|metadata|link|dep-info|mir]
--emit TYPE[=FILE]
Comma separated list of types of output for the
compiler to emit
compiler to emit.
Each TYPE has the default FILE name:
* asm - CRATE_NAME.s
* llvm-bc - CRATE_NAME.bc
* dep-info - CRATE_NAME.d
* link - (platform and crate-type dependent)
* llvm-ir - CRATE_NAME.ll
* metadata - libCRATE_NAME.rmeta
* mir - CRATE_NAME.mir
* obj - CRATE_NAME.o
* thin-link-bitcode - CRATE_NAME.indexing.o
--print INFO[=FILE]
Compiler information to print on stdout (or to a file)
INFO may be one of

2
tests/ui/invalid-compile-flags/emit-output-types-without-args.rs Normal file
View file

@ -0,0 +1,2 @@
//@ compile-flags: --emit
//@ error-pattern: Argument to option 'emit' missing

15
tests/ui/invalid-compile-flags/emit-output-types-without-args.stderr Normal file
View file

@ -0,0 +1,15 @@
error: Argument to option 'emit' missing
Usage:
--emit TYPE[=FILE] Comma separated list of types of output for the
compiler to emit.
Each TYPE has the default FILE name:
* asm - CRATE_NAME.s
* llvm-bc - CRATE_NAME.bc
* dep-info - CRATE_NAME.d
* link - (platform and crate-type dependent)
* llvm-ir - CRATE_NAME.ll
* metadata - libCRATE_NAME.rmeta
* mir - CRATE_NAME.mir
* obj - CRATE_NAME.o
* thin-link-bitcode - CRATE_NAME.indexing.o