From 5fbadd24ec350455dd24c31dd8dca64182346d3f Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 17 Jan 2012 17:22:03 -0800
Subject: [PATCH] rustdoc: Cleanup

---
 src/rustdoc/rustdoc.rc |  6 +++++-
 src/rustdoc/rustdoc.rs | 11 +----------
 src/rustdoc/util.rs    |  0
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 src/rustdoc/util.rs

diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc
index 7d6694e11316..7b76664f9347 100644
--- a/src/rustdoc/rustdoc.rc
+++ b/src/rustdoc/rustdoc.rc
@@ -1,3 +1,5 @@
+#[doc = "Rustdoc - The Rust documentation generator"];
+
 #[link(name = "rustdoc",
        vers = "0.1",
        uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
@@ -7,6 +9,9 @@
 #[license = "MIT"];
 #[crate_type = "bin"];
 
+use std;
+use rustc;
+
 mod parse;
 mod extract;
 mod attr_parser;
@@ -17,4 +22,3 @@ mod attr_pass;
 mod tystr_pass;
 mod prune_undoc_pass;
 mod astsrv;
-mod util;
\ No newline at end of file
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index afcacbd5556e..e811d8a935fc 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -2,9 +2,6 @@
  * Copyright 2011 Google Inc.
  */
 
-use std;
-use rustc;
-
 type pass = fn~(srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc;
 
 fn run_passes(
@@ -51,13 +48,6 @@ fn test_run_passes() {
     assert doc.topmod.name == "onetwothree";
 }
 
-#[doc(
-  brief = "Main function.",
-  desc = "Command-line arguments:
-
-*  argv[1]: crate file name",
-  args(argv = "Command-line arguments.")
-)]
 fn main(argv: [str]) {
 
     if vec::len(argv) != 2u {
@@ -69,6 +59,7 @@ fn main(argv: [str]) {
     run(source_file);
 }
 
+#[doc = "Runs rustdoc over the given file"]
 fn run(source_file: str) {
 
     let default_name = source_file;
diff --git a/src/rustdoc/util.rs b/src/rustdoc/util.rs
deleted file mode 100644
index e69de29bb2d1..000000000000