diff options
| author | bors <bors@rust-lang.org> | 2023-04-26 07:43:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-26 07:43:17 +0000 |
| commit | ae3ab14faa47ba581396b6fb1458bec3c9bd0bed (patch) | |
| tree | 9f836af6b4fc2d62cd76e64b65aa55a8e5e533e0 /compiler | |
| parent | 70540d51275086ce1a4cb12e9d96a97134df792e (diff) | |
| parent | 8c0dfa31f44636ebd35282bff0d08a922b8a8c0f (diff) | |
| download | rust-ae3ab14faa47ba581396b6fb1458bec3c9bd0bed.tar.gz rust-ae3ab14faa47ba581396b6fb1458bec3c9bd0bed.zip | |
Auto merge of #110839 - jyn514:rollup-uikilwm, r=jyn514
Rollup of 9 pull requests Successful merges: - #108416 (black_box doc corrections for clarification - Issue #107957) - #109379 (Replace `yes` command by `while-echo` in test `tests/ui/process/process-sigpipe.rs`) - #110266 (Update documentation wording on path 'try_exists' functions) - #110329 (Improve tests for #110138) - #110418 (Spelling rustdoc) - #110587 (Fix `std` compilation error for wasi+atomics) - #110594 (`rustc --help` add `--cfg` SPEC declaration.) - #110792 (Use the standard macOS CI runner) - #110817 (Add regression tests for const-generic inherent associated types) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_session/src/config.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index 79eb31bb105..51418c01eed 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -1400,7 +1400,8 @@ The default is {DEFAULT_EDITION} and the latest stable edition is {LATEST_STABLE pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> { vec![ opt::flag_s("h", "help", "Display this message"), - opt::multi_s("", "cfg", "Configure the compilation environment", "SPEC"), + opt::multi_s("", "cfg", "Configure the compilation environment. + SPEC supports the syntax `NAME[=\"VALUE\"]`.", "SPEC"), opt::multi("", "check-cfg", "Provide list of valid cfg options for checking", "SPEC"), opt::multi_s( "L", |