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

auto merge of #11574 : neeee/rust/master, r=alexcrichton

Browse source 
Reverted according to https://github.com/mozilla/rust/issues/11458#issuecomment-32269477. Fixes #11458.
This commit is contained in:
bors 2014-01-15 19:06:45 -08:00
commit bf2ab22cd0
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/driver/driver.rs
View file

@ -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"),

7
src/librustc/lib.rs
View file

@ -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;
}