diff options
| -rw-r--r-- | src/librustc/driver/driver.rs | 2 | ||||
| -rw-r--r-- | src/librustc/lib.rs | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index aa3ab80b487..9cb7f2e34ae 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -1011,7 +1011,7 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] { for details)", "FEATURE"), optopt("", "android-cross-path", "The path to the Android NDK", "PATH"), - optflagopt("W", "warn", + optmulti("W", "warn", "Set lint warnings", "OPT"), optmulti("A", "allow", "Set lint allowed", "OPT"), diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index eb4623d554b..dd1346e86e8 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -227,14 +227,9 @@ pub fn run_compiler(args: &[~str], demitter: @diagnostic::Emitter) { return; } - // Display the available lint options if "-W help" or only "-W" is given. let lint_flags = vec::append(matches.opt_strs("W"), matches.opt_strs("warn")); - - let show_lint_options = lint_flags.iter().any(|x| x == &~"help") || - (matches.opt_present("W") && lint_flags.is_empty()); - - if show_lint_options { + if lint_flags.iter().any(|x| x == &~"help") { describe_warnings(); return; } |