user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #43556 - dmizuk:remove-z-opt-usage, r=arielb1

Browse source 
librustc_driver: Remove -Z option from usage on stable compiler

The `-Z` flag has been disabled since Rust 1.19 stable, but it still shows in `rustc --help`.

This PR addresses the inconsistency by removing the message on the stable channel.
This commit is contained in:
bors 2017-07-30 20:19:53 +00:00
commit aac223f4f5
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_driver/lib.rs
View file

@ -795,7 +795,12 @@ fn usage(verbose: bool, include_unstable_options: bool) {
(option.apply)(&mut options); (option.apply)(&mut options);
} }
let message = format!("Usage: rustc [OPTIONS] INPUT"); let message = format!("Usage: rustc [OPTIONS] INPUT");
let extra_help = if verbose { let nightly_help = if nightly_options::is_nightly_build() {
"\n -Z help Print internal options for debugging rustc"
} else {
""
};
let verbose_help = if verbose {
"" ""
} else { } else {
"\n --help -v Print the full set of options rustc accepts" "\n --help -v Print the full set of options rustc accepts"
@ -803,11 +808,10 @@ fn usage(verbose: bool, include_unstable_options: bool) {
println!("{}\nAdditional help: println!("{}\nAdditional help:
-C help Print codegen options -C help Print codegen options
-W help \ -W help \
Print 'lint' options and default settings Print 'lint' options and default settings{}{}\n",
-Z help Print internal \
options for debugging rustc{}\n",
options.usage(&message), options.usage(&message),
extra_help); nightly_help,
verbose_help);
} }
fn describe_lints(lint_store: &lint::LintStore, loaded_plugins: bool) { fn describe_lints(lint_store: &lint::LintStore, loaded_plugins: bool) {