bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #11461 : alexcrichton/rust/rustdoc-fixes, r=brson

Browse source 
See the commits.
This commit is contained in:
bors 2014-01-11 02:41:23 -08:00
commit 01794cc993
4 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/lib.rs
View file

@ -83,6 +83,7 @@ pub fn opts() -> ~[groups::OptGroup] {
use extra::getopts::groups::*;
~[
optflag("h", "help", "show this help message"),
optflag("", "version", "print rustdoc's version"),
optopt("r", "input-format", "the input type of the specified file",
"[rust|json]"),
optopt("w", "output-format", "the output type to write",
@ -119,6 +120,9 @@ pub fn main_args(args: &[~str]) -> int {
if matches.opt_present("h") || matches.opt_present("help") {
usage(args[0]);
return 0;
} else if matches.opt_present("version") {
rustc::version(args[0]);
return 0;
}
if matches.free.len() == 0 {