---

yaml
---
r: 14544
b: refs/heads/try
c: 6c9527a
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 362f23641a737bb16b85b2da091c222bc7358dc4
+refs/heads/try: 6c9527ab79ab66f3f8b8426e006cf58a447c0017
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/config.rs

@@ -4,6 +4,7 @@ export output_format::{};
 export output_style::{};
 export config;
 export parse_config;
+export usage;
 
 #[doc = "The type of document to output"]
 enum output_format {
@@ -34,20 +35,34 @@ fn opt_output_dir() -> str { "output-dir" }
 fn opt_output_format() -> str { "output-format" }
 fn opt_output_style() -> str { "output-style" }
 fn opt_pandoc_cmd() -> str { "pandoc-cmd" }
+fn opt_help() -> str { "h" }
 
 fn opts() -> [(getopts::opt, str)] {
     [
         (getopts::optopt(opt_output_dir()),
-         "put documents here"),
+         "--output-dir <val>     put documents here"),
         (getopts::optopt(opt_output_format()),
-         "either 'markdown' or 'html'"),
+         "--output-format <val>  either 'markdown' or 'html'"),
         (getopts::optopt(opt_output_style()),
-         "either 'doc-per-crate' or 'doc-per-mod'"),
+         "--output-style <val>   either 'doc-per-crate' or 'doc-per-mod'"),
         (getopts::optopt(opt_pandoc_cmd()),
-         "the command for running pandoc")
+         "--pandoc-cmd <val>     the command for running pandoc"),
+        (getopts::optflag(opt_help()),
+         "-h                     print help")
     ]
 }
 
+fn usage() {
+    import std::io::println;
+
+    println("Usage: rustdoc [options] <cratefile>\n");
+    println("Options:\n");
+    for opt in opts() {
+        println(#fmt("    %s", tuple::second(opt)));
+    }
+    println("");
+}
+
 fn default_config(input_crate: str) -> config {
     {
         input_crate: input_crate,

branches/try/src/rustdoc/rustdoc.rs

@@ -95,6 +95,11 @@ fn test_run_passes() {
 
 fn main(argv: [str]) {
 
+    if vec::contains(argv, "-h") {
+        config::usage();
+        ret;
+    }
+
     if vec::len(argv) != 2u {
         std::io::println(#fmt("usage: %s <input>", argv[0]));
         ret;