diff options
| author | bors <bors@rust-lang.org> | 2021-02-20 21:38:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-20 21:38:53 +0000 |
| commit | d2b38d6b3c9d1ee52a360c3ce61e54b7aa91d405 (patch) | |
| tree | 33ce45d4d6fd685e3fbd9b02da5eaff94090a872 /compiler/rustc_driver | |
| parent | 83b30a639d5abd1270ade35d9bd92271f5a5ba18 (diff) | |
| parent | fc0cb5d5eb58135cde86f28895e8c282bb2e77d3 (diff) | |
Auto merge of #82341 - GuillaumeGomez:rollup-t7y7tyg, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #80595 (`impl PartialEq<Punct> for char`; symmetry for #78636) - #81991 (Fix panic in 'remove semicolon' when types are not local) - #82176 (fix MIR fn-ptr pretty-printing) - #82244 (Keep consistency in example for Stdin StdinLock) - #82260 (rustc: Show ``@path`` usage in stable) - #82316 (Fix minor mistake in LTO docs.) - #82332 (Don't generate src link on dummy spans) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_driver')
| -rw-r--r-- | compiler/rustc_driver/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs index 07c7278a2f4..79bb21b29fc 100644 --- a/compiler/rustc_driver/src/lib.rs +++ b/compiler/rustc_driver/src/lib.rs @@ -812,7 +812,7 @@ fn usage(verbose: bool, include_unstable_options: bool, nightly_build: bool) { } else { "\n --help -v Print the full set of options rustc accepts" }; - let at_path = if verbose && nightly_build { + let at_path = if verbose { " @path Read newline separated options from `path`\n" } else { "" |